What's cooking (2022/10 #03)

1 files changed, 531 insertions, 446 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 7a835d7713..90c9ff3ab9 100644
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,9 +1,9 @@
 To: git@vger.kernel.org
-Subject: What's cooking in git.git (Oct 2022, #02; Thu, 6)
-X-master-at: 3dcec76d9df911ed8321007b1d197c1a206dc164
-X-next-at: 74048e4d9e2b6a27a4fab355a907e0c38d172bfd
+Subject: What's cooking in git.git (Oct 2022, #03; Mon, 10)
+X-master-at: e85701b4af5b7c2a9f3a1b07858703318dce365d
+X-next-at: e2ab570f502f4a79dcd18c809dbed1581c00e4e5
 
-What's cooking in git.git (Oct 2022, #02; Thu, 6)
+What's cooking in git.git (Oct 2022, #03; Mon, 10)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -13,10 +13,10 @@ release).  Commits prefixed with '-' are only in 'seen', and aren't
 considered "accepted" at all.  A topic without enough support may be
 discarded after a long period of no activity.
 
-It seems that there aren't many regressions we need to fix
-immediately in the most recent release, so let's start merging some
-topics that have already been cooking in 'next' down to 'master' and
-also some topics that were kept in 'seen' down to 'next' soonish.
+Some topics have been expecting updates for too long.  Before, or
+soon after, rewinding the 'next' branch and opening the floodgates
+for this cycle, we may want to discard them, unless they see some
+activities.
 
 Copies of the source code to Git live in many repositories, and the
 following is a list of the ones I push into or their mirrors.  Some
@@ -47,136 +47,449 @@ Release tarballs are available at:
 	https://www.kernel.org/pub/software/scm/git/
 
 --------------------------------------------------
-[New Topics]
+[Graduated to 'master']
 
-* jk/sequencer-missing-author-name-check (2022-10-03) 1 commit
- - sequencer: detect author name errors in read_author_script()
+* ab/test-malloc-with-sanitize-leak (2022-09-29) 1 commit
+  (merged to 'next' on 2022-09-29 at b6fef2dd1f)
+ + test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
 
- Typofix in code.
+ Test fix.
+ source: <patch-1.1-e31681731b7-20220928T095041Z-avarab@gmail.com>
 
- Will merge to 'next'.
- source: <YzqhEcTDwMwa8dQX@coredump.intra.peff.net>
 
+* ac/fuzzers (2022-09-19) 1 commit
+  (merged to 'next' on 2022-09-29 at 600f45a53b)
+ + fuzz: reorganise the path for existing oss-fuzz fuzzers
 
-* pw/mailinfo-b-fix (2022-10-03) 1 commit
- - mailinfo -b: fix an out of bounds access
+ Source file shuffling.
+ source: <pull.1353.v4.git.1663598215154.gitgitgadget@gmail.com>
 
- Fix a logic in "mailinfo -b" that miscomputed the length of a
- substring, which lead to an out-of-bounds access.
 
- Will merge to 'next'.
+* ah/branch-autosetupmerge-grammofix (2022-09-28) 1 commit
+  (merged to 'next' on 2022-09-29 at 622b75f0da)
+ + push: improve grammar of branch.autoSetupMerge advice
 
+ Fix grammar of a message introduced in previous round.
+ source: <20220928055811.777227-1-alexhenrie24@gmail.com>
 
-* pw/ssh-sign-report-errors (2022-10-05) 1 commit
- - ssh signing: return an error when signature cannot be read
 
- The codepath to sign learned to report errors when it fails to read
- from "ssh-keygen".
+* ah/fsmonitor-daemon-usage-non-l10n (2022-09-21) 1 commit
+  (merged to 'next' on 2022-09-21 at bc69a73c6c)
+ + fsmonitor--daemon: don't translate literal commands
 
- Will merge to 'next'.
- source: <pull.1371.v2.git.1664877694430.gitgitgadget@gmail.com>
+ Fix messages incorrectly marked for translation.
+ source: <20220920050709.326359-1-alexhenrie24@gmail.com>
 
 
-* ab/run-hook-api-cleanup (2022-10-05) 15 commits
- - run-command.c: don't copy "ungroup" to "struct parallel_processes"
- - run-command.c: don't copy *_fn to "struct parallel_processes"
- - run-command API: move *_tr2() users to "run_processes_parallel()"
- - run-command API: have run_process_parallel() take an "opts" struct
- - run-command API: make run_process_parallel{,_tr2}() thin wrappers
- - run-command API: add nascent "struct run_process_parallel_opts"
- - run-command.c: add an initializer for "struct parallel_processes"
- - run-command API: don't fall back on online_cpus()
- - run-command API: make "jobs" parameter an "unsigned int"
- - run-command API: have "run_processes_parallel{,_tr2}()" return void
- - run-command tests: use "return", not "exit"
- - run-command test helper: use "else if" pattern
- - run-command tests: test stdout of run_command_parallel()
- - submodule tests: reset "trace.out" between "grep" invocations
- - hook tests: fix redirection logic error in 96e7225b310
+* dd/retire-efgrep (2022-09-21) 4 commits
+  (merged to 'next' on 2022-09-21 at 22bc339be1)
+ + t: convert fgrep usage to "grep -F"
+ + t: convert egrep usage to "grep -E"
+ + t: remove \{m,n\} from BRE grep usage
+ + CodingGuidelines: allow grep -E
+ (this branch is used by es/retire-efgrep.)
 
- Move a global variable added as a hack during regression fixes to
- its proper place in the API.
+ Prepare for GNU [ef]grep that throw warning of their uses.
+ source: <cover.1663765176.git.congdanhqx@gmail.com>
 
- Needs review.
- source: <cover-00.15-00000000000-20220930T111343Z-avarab@gmail.com>
 
+* ds/scalar-unregister-idempotent (2022-09-27) 4 commits
+  (merged to 'next' on 2022-09-28 at a09a78d861)
+ + string-list: document iterator behavior on NULL input
+ + gc: replace config subprocesses with API calls
+ + scalar: make 'unregister' idempotent
+ + maintenance: add 'unregister --force'
 
-* nb/doc-mergetool-typofix (2022-10-05) 1 commit
- - mergetool.txt: typofix 'overwriten' -> 'overwritten'
+ "scalar unregister" in a repository that is already been
+ unregistered reported an error.
+ source: <pull.1358.v4.git.1664287021.gitgitgadget@gmail.com>
 
- Typofix.
 
- Will merge to 'next'.
- source: <pull.1350.git.git.1664844924663.gitgitgadget@gmail.com>
+* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
+  (merged to 'next' on 2022-09-14 at 80905596d8)
+ + grep: fix multibyte regex handling under macOS
 
+ With a bit of header twiddling, use the native regexp library on
+ macOS instead of the compat/ one.
+ source: <20220826085815.2771102-1-dds@aueb.gr>
 
-* rs/bisect-start-leakfix (2022-10-05) 1 commit
- - bisect--helper: plug strvec leak in bisect_start()
 
- Code clean-up that results in plugging a leak.
+* es/retire-efgrep (2022-09-23) 2 commits
+  (merged to 'next' on 2022-09-27 at 344fdd138e)
+ + check-non-portable-shell: detect obsolescent egrep/fgrep
+ + Merge branch 'dd/retire-efgrep' into es/retire-efgrep
+ (this branch uses dd/retire-efgrep.)
 
- Expecting a reroll.
- cf. <04d393cc-d8c7-ddf7-b235-12082f81c560@web.de>
- source: <5c6a4c30-d454-51b6-ec57-9af036b9c4e0@web.de>
+ Prepare for GNU [ef]grep that throw warning of their uses.
+ source: <pull.1338.git.git.1663805905554.gitgitgadget@gmail.com>
 
 
-* rs/gc-pack-refs-simplify (2022-10-05) 1 commit
- - gc: simplify maintenance_task_pack_refs()
+* hn/parse-worktree-ref (2022-09-19) 1 commit
+  (merged to 'next' on 2022-09-29 at 1f4453eb83)
+ + refs: unify parse_worktree_ref() and ref_type()
+
+ Code and semantics cleaning.
+ source: <pull.1325.v2.git.git.1663605291172.gitgitgadget@gmail.com>
+
+
+* ja/rebase-i-avoid-amending-self (2022-09-26) 1 commit
+  (merged to 'next' on 2022-09-29 at 2635f37dae)
+ + sequencer: avoid dropping fixup commit that targets self via commit-ish
+
+ "git rebase -i" can mistakenly attempt to apply a fixup to a commit
+ itself, which has been corrected.
+ source: <20220924222904.1784975-1-aclopte@gmail.com>
+
+
+* jc/environ-docs (2022-09-16) 5 commits
+  (merged to 'next' on 2022-09-29 at a0a43b8de5)
+ + environ: GIT_INDEX_VERSION affects not just a new repository
+ + environ: simplify description of GIT_INDEX_FILE
+ + environ: GIT_FLUSH should be made a usual Boolean
+ + environ: explain Boolean environment variables
+ + environ: document GIT_SSL_NO_VERIFY
+
+ Documentation on various Boolean GIT_* environment variables have
+ been clarified.
+ source: <20220915160659.126441-1-gitster@pobox.com>
+
+
+* jk/clone-allow-bare-and-o-together (2022-09-22) 1 commit
+  (merged to 'next' on 2022-09-27 at 1feca721ac)
+ + clone: allow "--bare" with "-o"
+
+ "git clone" did not like to see the "--bare" and the "--origin"
+ options used together without a good reason.
+ source: <YyvzVdfQVdysvMp2@coredump.intra.peff.net>
+
+
+* jk/fsck-on-diet (2022-09-22) 3 commits
+  (merged to 'next' on 2022-09-27 at c2e93082a1)
+ + parse_object_buffer(): respect save_commit_buffer
+ + fsck: turn off save_commit_buffer
+ + fsck: free tree buffers after walking unreachable objects
+
+ "git fsck" failed to release contents of tree objects already used
+ from the memory, which has been fixed.
+ source: <Yyw0PSVe3YTQGgRS@coredump.intra.peff.net>
+
+
+* jk/remote-rename-without-fetch-refspec (2022-09-22) 1 commit
+  (merged to 'next' on 2022-09-27 at 165fe0a832)
+ + remote: handle rename of remote without fetch refspec
+
+ "git remote rename" failed to rename a remote without fetch
+ refspec, which has been corrected.
+ source: <YyvzqZ5tmI0UdRAW@coredump.intra.peff.net>
+
+
+* js/merge-ort-in-read-only-repo (2022-09-28) 2 commits
+  (merged to 'next' on 2022-09-29 at 84df46c1b4)
+ + merge-ort: return early when failing to write a blob
+ + merge-ort: fix segmentation fault in read-only repositories
+
+ In read-only repositories, "git merge-tree" tried to come up with a
+ merge result tree object, which it failed (which is not wrong) and
+ led to a segfault (which is bad), which has been corrected.
+ source: <pull.1362.v5.git.1664350162.gitgitgadget@gmail.com>
+
+
+* mc/cred-helper-ignore-unknown (2022-09-22) 3 commits
+  (merged to 'next' on 2022-09-27 at ce6e3616aa)
+ + osxkeychain: clarify that we ignore unknown lines
+ + netrc: ignore unknown lines (do not die)
+ + wincred: ignore unknown lines (do not die)
+
+ Most credential helpers ignored unknown entries in a credential
+ description, but a few died upon seeing them.  The latter were
+ taught to ignore them, too
+ source: <pull.1363.git.1663865974.gitgitgadget@gmail.com>
+
+
+* rj/ref-filter-get-head-description-leakfix (2022-09-26) 1 commit
+  (merged to 'next' on 2022-09-29 at d05d052eb1)
+ + ref-filter.c: fix a leak in get_head_description
+
+ Leakfix.
+ source: <6ff29e96-7f8d-c354-dced-b1b363e54467@gmail.com>
+
+
+* so/diff-merges-cleanup (2022-09-16) 3 commits
+  (merged to 'next' on 2022-09-22 at 57694bbed7)
+ + diff-merges: clarify log.diffMerges documentation
+ + diff-merges: cleanup set_diff_merges()
+ + diff-merges: cleanup func_by_opt()
 
  Code clean-up.
+ source: <20220914193102.5275-1-sorganov@gmail.com>
 
- Will merge to 'next'.
- source: <ab33f72e-d552-7bd7-bf04-3c476d32b5b6@web.de>
 
+* sy/sparse-grep (2022-09-23) 1 commit
+  (merged to 'next' on 2022-09-29 at a5bc34b9c5)
+ + builtin/grep.c: integrate with sparse index
 
-* rs/test-httpd-in-C-locale (2022-10-06) 1 commit
- - t/lib-httpd: pass LANG and LC_ALL to Apache
+ "git grep" learned to expand the sparse-index more lazily and on
+ demand in a sparse checkout.
+ source: <20220923041842.27817-2-shaoxuan.yuan02@gmail.com>
 
- Force C locale while running tests around httpd to make sure we can
- find expected error messages in the log.
+
+* tb/midx-repack-ignore-cruft-packs (2022-09-21) 7 commits
+  (merged to 'next' on 2022-09-29 at 55474c6ecc)
+ + midx.c: avoid cruft packs with non-zero `repack --batch-size`
+ + midx.c: remove unnecessary loop condition
+ + midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
+ + midx.c: avoid cruft packs with `repack --batch-size=0`
+ + midx.c: prevent `expire` from removing the cruft pack
+ + Documentation/git-multi-pack-index.txt: clarify expire behavior
+ + Documentation/git-multi-pack-index.txt: fix typo
+
+ "git multi-pack-index repack/expire" used to repack unreachable
+ cruft into a new pack, which have been corrected.
+ cf. <63a1c3d4-eff3-af10-4263-058c88e74594@github.com>
+ source: <cover.1663638929.git.me@ttaylorr.com>
+
+
+* vd/fix-unaligned-read-index-v4 (2022-09-28) 1 commit
+  (merged to 'next' on 2022-09-28 at 5b3425fd58)
+ + read-cache: avoid misaligned reads in index v4
+
+ The codepath that reads from the index v4 had unaligned memory
+ accesses, which has been corrected.
+ source: <pull.1366.v2.git.1664385541084.gitgitgadget@gmail.com>
+
+--------------------------------------------------
+[New Topics]
+
+* ab/coding-guidelines-c99 (2022-10-10) 5 commits
+ - CodingGuidelines: recommend against unportable C99 struct syntax
+ - CodingGuidelines: mention C99 features we can't use
+ - CodingGuidelines: allow declaring variables in for loops
+ - CodingGuidelines: mention dynamic C99 initializer elements
+ - CodingGuidelines: update for C99
+
+ Update CodingGuidelines to clarify what features to use and avoid
+ in C99.
+
+ Will merge to 'next'?
+ source: <20221010203800.2154698-1-gitster@pobox.com>
+
+
+* ds/bundle-uri-docfix (2022-10-07) 1 commit
+  (merged to 'next' on 2022-10-07 at 9ebc1e497a)
+ + bundle-uri: fix technical doc issues
+
+ Doc formatting fix.
+
+ Will merge to 'master'.
+ source: <pull.1377.git.1665157810025.gitgitgadget@gmail.com>
+
+
+* jc/symbolic-ref-no-recurse (2022-10-09) 1 commit
+ - symbolic-ref: teach "--[no-]recurse" option
+
+ After checking out a "branch" that is a symbolic-ref that points at
+ another branch, "git symbolic-ref HEAD" reports the underlying
+ branch, not the symbolic-ref the user gave checkout as argument.
+ The command learned the "--no-recurse" option to stop after
+ dereferencing a symbolic-ref only once.
+
+ Will merge to 'next'?
+ source: <xmqqleprcn08.fsf@gitster.g>
+
+
+* jc/use-of-uc-in-log-messages (2022-10-07) 1 commit
+ - SubmittingPatches: use usual capitalization in the log message body
+
+ Clarify that "the sentence after <area>: prefix does not begin with
+ a capital letter" rule applies only to the commit title.
 
  Will merge to 'next'.
- source: <a1699375-c660-13ab-42fb-26a8afe4c376@web.de>
+ source: <xmqqedvjfqx1.fsf@gitster.g>
 
 
-* ab/unused-annotation (2022-10-05) 1 commit
- - git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
+* ds/cmd-main-reorder (2022-10-08) 1 commit
+ - git.c: improve code readability in cmd_main()
 
- source: <20221005221928.703750-1-asedeno@google.com>
+ Code clean-up.
 
+ Will merge to 'next'?
+ source: <pull.1355.v3.git.git.1665246097190.gitgitgadget@gmail.com>
 
-* dd/document-runtime-prefix-better (2022-10-05) 1 commit
- - Makefile: clarify runtime relative gitexecdir
 
- source: <20221006013205.15015-1-congdanhqx@gmail.com>
+* ed/fsmonitor-inotify (2022-10-09) 6 commits
+ . fsmonitor: update doc for Linux
+ . fsmonitor: test updates
+ . fsmonitor: enable fsmonitor for Linux
+ . fsmonitor: implement filesystem change listener for Linux
+ . fsmonitor: determine if filesystem is local or remote
+ . fsmonitor: prepare to share code between Mac OS and Linux
+ (this branch uses ed/fsmonitor-on-networked-macos.)
 
+ Bundled fsmonitor for Linux using inotify API.
+
+ Needs review.
+ source: <pull.1326.v15.git.1664904751.gitgitgadget@gmail.com>
+ source: <pull.1352.git.git.1665326258.gitgitgadget@gmail.com>
 
-* jk/cleanup-callback-parameters (2022-10-06) 4 commits
- - attr: drop DEBUG_ATTR code
- - commit: avoid writing to global in option callback
- - multi-pack-index: avoid writing to global in option callback
- - test-submodule: inline resolve_relative_url() function
+
+* en/sparse-checkout-design (2022-10-08) 1 commit
+ - sparse-checkout.txt: new document with sparse-checkout directions
+
+ source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com>
+
+
+* jc/more-sanitizer-at-ci (2022-10-09) 1 commit
+ - ci: add address and undefined sanitizer tasks
+
+
+* rs/use-fspathncmp (2022-10-08) 1 commit
+ - dir: use fspathncmp() in pl_hashmap_cmp()
 
  Code clean-up.
 
  Will merge to 'next'.
- source: <Yz7Tjy7Rh8cXVxYQ@coredump.intra.peff.net>
- source: <Yz7UhYXvNl6+1GbZ@coredump.intra.peff.net>
+ source: <cb6ffcdb-d719-7928-96b8-e46482dd141f@web.de>
 
 
-* pw/test-todo (2022-10-06) 3 commits
- - test_todo: allow [verbose] test as the command
- - test_todo: allow [!] grep as the command
- - tests: add test_todo() to mark known breakages
+* jh/struct-zero-init-with-older-clang (2022-10-10) 1 commit
+ - config.mak.dev: disable suggest braces error on old clang versions
 
- RFC for test framework improvement.
+ source: <pull.1375.v2.git.1665416340806.gitgitgadget@gmail.com>
 
- Needs review.
- source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
+
+* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
+ - ci(main): linux32 uses actions/checkout@v2
+ - ci(main): upgrade actions/checkout to v3
+
+ source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
+
+
+* pw/remove-rebase-p-test (2022-10-10) 1 commit
+ - t3435: remove redundant test case
+
+ source: <pull.1379.git.1665395106351.gitgitgadget@gmail.com>
 
 --------------------------------------------------
 [Stalled]
 
+* ag/merge-strategies-in-c (2022-08-10) 14 commits
+ - sequencer: use the "octopus" strategy without forking
+ - sequencer: use the "resolve" strategy without forking
+ - merge: use the "octopus" strategy without forking
+ - merge: use the "resolve" strategy without forking
+ - merge-octopus: rewrite in C
+ - merge-recursive: move better_branch_name() to merge.c
+ - merge-resolve: rewrite in C
+ - merge-one-file: rewrite in C
+ - update-index: move add_cacheinfo() to read-cache.c
+ - merge-index: add a new way to invoke `git-merge-one-file'
+ - merge-index: drop the index
+ - merge-index: libify merge_one_path() and merge_all()
+ - t6060: add tests for removed files
+ - t6060: modify multiple files to expose a possible issue with merge-index
+
+ An attempt to rewrite remaining merge strategies from shell to C.
+
+ Needs more work.
+ At the minimum, we should lose 11/14 and possibly 08/14.
+ cf. <xmqq7d36vfur.fsf@gitster.g>
+ source: <20220809185429.20098-1-alban.gruin@gmail.com>
+
+
+* po/glossary-around-traversal (2022-07-09) 3 commits
+ - glossary: add reachability bitmap description
+ - glossary: add commit graph description
+ - glossary: add Object DataBase (ODB) abbreviation
+
+ The glossary entries for "commit-graph file" and "reachability
+ bitmap" have been added.
+
+ Expecting a reroll.
+ cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email>
+ source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
+
+
+* pw/rebase-keep-base-fixes (2022-09-07) 7 commits
+ - rebase --keep-base: imply --no-fork-point
+ - rebase --keep-base: imply --reapply-cherry-picks
+ - rebase: factor out branch_base calculation
+ - rebase: rename merge_base to branch_base
+ - rebase: store orig_head as a commit
+ - t3416: set $EDITOR in subshell
+ - t3416: tighten two tests
+
+ "git rebase --keep-base" used to discard the commits that are
+ already cherry-picked to the upstream, even when "keep-base" meant
+ that the base, on top of which the history is being rebuilt, does
+ not yet include these cherry-picked commits.  The --keep-base
+ option now implies --reapply-cherry-picks and --no-fork-point
+ options.
+
+ Expecting a reroll.
+ cf. <e25127f3-6135-b716-a12f-5dbe4f40dc42@gmail.com>
+ source: <pull.1323.v2.git.1662561470.gitgitgadget@gmail.com>
+
+
+* js/cmake-updates (2022-08-24) 5 commits
+ - cmake: increase time-out for a long-running test
+ - cmake: avoid editing t/test-lib.sh
+ - add -p: avoid ambiguous signed/unsigned comparison
+ - cmake: copy the merge tools for testing
+ - cmake: make it easier to diagnose regressions in CTest runs
+
+ Update to build procedure with VS using CMake/CTest.
+
+ Expecting a reroll.
+ cf. <3df77ffd-85a2-3a54-9005-34a24ec6e82d@github.com>
+ cf. <531620e1-de4c-74aa-c840-c12ce81f8740@github.com> and others
+ source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
+
+
+* gc/submodule-clone-update-with-branches (2022-08-29) 6 commits
+ - clone, submodule update: check out branches
+ - submodule--helper: refactor up-to-date criterion
+ - submodule: return target of submodule symref
+ - t5617: drop references to remote-tracking branches
+ - repo-settings: add submodule_propagate_branches
+ - clone: teach --detach option
+
+ "git clone --recurse-submodules" and "git submodule update" learns
+ to honor the "propagete branches" option.
+
+ Expecting a reroll.
+ cf. <20220901200047.515294-1-jonathantanmy@google.com> and others
+ source: <pull.1321.git.git.1661806456.gitgitgadget@gmail.com>
+
+
+* tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit
+ - diff.c: use utf8_strwidth() to count display width
+
+ "git diff --stat" etc. were invented back when everything was ASCII
+ and strlen() was a way to measure the display width of a string;
+ adjust them to compute the display width assuming UTF-8 pathnames.
+
+ Expecting a reroll.
+ source: <20220914151333.3309-1-tboegi@web.de>
+
+
+* mj/credential-helper-auth-headers (2022-09-13) 8 commits
+ - http: set specific auth scheme depending on credential
+ - http: move proactive auth to first slot creation
+ - http: store all request headers on active_request_slot
+ - credential: add WWW-Authenticate header to cred requests
+ - http: read HTTP WWW-Authenticate response headers
+ - osxkeychain: clarify that we ignore unknown lines
+ - netrc: ignore unknown lines (do not die)
+ - wincred: ignore unknown lines (do not die)
+
+ Extending credential helper protocol.
+
+ Expecting a reroll.
+ A separate non-RFC submission of the first three is expected.
+ cf. <AS8PR03MB86897FAC3E1E4F03D4420644C04F9@AS8PR03MB8689.eurprd03.prod.outlook.com>
+ source: <pull.1352.git.1663097156.gitgitgadget@gmail.com>
+
+
 * cw/submodule-status-in-parallel (2022-09-23) 4 commits
  . diff-lib: parallelize run_diff_files for submodules
  . diff-lib: refactor functions
@@ -233,322 +546,214 @@ Release tarballs are available at:
 --------------------------------------------------
 [Cooking]
 
-* jc/tmp-objdir (2022-09-30) 1 commit
- - tmp-objdir: skip clean up when handling a signal
-
- The code to clean temporary object directories (used for
- quarantine) tried to remove them inside its signal handler, which
- was a no-no.
-
- Will merge to 'next'?
- source: <pull.1348.v4.git.git.1664570831583.gitgitgadget@gmail.com>
-
-
-* jc/branch-description-unset (2022-09-30) 1 commit
- - branch: do not fail a no-op --edit-desc
-
- "GIT_EDITOR=: git branch --edit-description" resulted in failure,
- which has been corrected.
-
- Will merge to 'next'?
- source: <xmqqmtagka8x.fsf@gitster.g>
-
-
-* rj/branch-edit-desc-unborn (2022-09-30) 1 commit
- - branch: description for non-existent branch errors
-
- "git branch --edit-description" on an unborh branch misleadingly
- said that no such branch exists, which has been corrected.
-
- Will merge to 'next'?
- source: <930ff836-a5c4-0e85-517d-39645f00cd31@gmail.com>
-
-
-* ab/test-malloc-with-sanitize-leak (2022-09-29) 1 commit
-  (merged to 'next' on 2022-09-29 at b6fef2dd1f)
- + test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
-
- Test fix.
-
- Will merge to 'master'?
- source: <patch-1.1-e31681731b7-20220928T095041Z-avarab@gmail.com>
-
-
-* ah/branch-autosetupmerge-grammofix (2022-09-28) 1 commit
-  (merged to 'next' on 2022-09-29 at 622b75f0da)
- + push: improve grammar of branch.autoSetupMerge advice
-
- Fix grammar of a message introduced in previous round.
-
- Will merge to 'master'?
- source: <20220928055811.777227-1-alexhenrie24@gmail.com>
-
-
-* jt/promisor-remote-fetch-tweak (2022-10-05) 2 commits
- - promisor-remote: die upon failing fetch
- - promisor-remote: remove a return value
-
- Remove error detection from a function that fetches from promisor
- remotes, and make it die when such a fetch fails to bring all the
- requested objects, to give an early failure to various operations.
-
- Will merge to 'next'?
- Can somebody give a quick read on the test part of the patch?
- source: <cover.1664917853.git.jonathantanmy@google.com>
-
-
-* rj/ref-filter-get-head-description-leakfix (2022-09-26) 1 commit
-  (merged to 'next' on 2022-09-29 at d05d052eb1)
- + ref-filter.c: fix a leak in get_head_description
+* jk/sequencer-missing-author-name-check (2022-10-03) 1 commit
+  (merged to 'next' on 2022-10-07 at 6a9f7e8b80)
+ + sequencer: detect author name errors in read_author_script()
 
- Leakfix.
+ Typofix in code.
 
- Will merge to 'master'?
- source: <6ff29e96-7f8d-c354-dced-b1b363e54467@gmail.com>
+ Will merge to 'master'.
+ source: <YzsdRuD2CdJFdNVG@coredump.intra.peff.net>
 
 
-* ds/scalar-unregister-idempotent (2022-09-27) 4 commits
-  (merged to 'next' on 2022-09-28 at a09a78d861)
- + string-list: document iterator behavior on NULL input
- + gc: replace config subprocesses with API calls
- + scalar: make 'unregister' idempotent
- + maintenance: add 'unregister --force'
+* pw/mailinfo-b-fix (2022-10-03) 1 commit
+  (merged to 'next' on 2022-10-07 at 5c5d79daef)
+ + mailinfo -b: fix an out of bounds access
 
- "git maintenance unregister" in a repository that is already been
- unregistered reported an error.
+ Fix a logic in "mailinfo -b" that miscomputed the length of a
+ substring, which lead to an out-of-bounds access.
 
- Will merge to 'master'?
- source: <pull.1358.v4.git.1664287021.gitgitgadget@gmail.com>
+ Will merge to 'master'.
+ source: <pull.1372.git.1664789011089.gitgitgadget@gmail.com>
 
 
-* jk/clone-allow-bare-and-o-together (2022-09-22) 1 commit
-  (merged to 'next' on 2022-09-27 at 1feca721ac)
- + clone: allow "--bare" with "-o"
+* pw/ssh-sign-report-errors (2022-10-05) 1 commit
+  (merged to 'next' on 2022-10-07 at 4df1d2379a)
+ + ssh signing: return an error when signature cannot be read
 
- "git clone" did not like to see the "--bare" and the "--origin"
- options used together without a good reason.
+ The codepath to sign learned to report errors when it fails to read
+ from "ssh-keygen".
 
- Will merge to 'master'?
- source: <YyvzVdfQVdysvMp2@coredump.intra.peff.net>
+ Will merge to 'master'.
+ source: <pull.1371.v2.git.1664877694430.gitgitgadget@gmail.com>
 
 
-* jk/fsck-on-diet (2022-09-22) 3 commits
-  (merged to 'next' on 2022-09-27 at c2e93082a1)
- + parse_object_buffer(): respect save_commit_buffer
- + fsck: turn off save_commit_buffer
- + fsck: free tree buffers after walking unreachable objects
+* ab/run-hook-api-cleanup (2022-10-05) 15 commits
+ - run-command.c: don't copy "ungroup" to "struct parallel_processes"
+ - run-command.c: don't copy *_fn to "struct parallel_processes"
+ - run-command API: move *_tr2() users to "run_processes_parallel()"
+ - run-command API: have run_process_parallel() take an "opts" struct
+ - run-command API: make run_process_parallel{,_tr2}() thin wrappers
+ - run-command API: add nascent "struct run_process_parallel_opts"
+ - run-command.c: add an initializer for "struct parallel_processes"
+ - run-command API: don't fall back on online_cpus()
+ - run-command API: make "jobs" parameter an "unsigned int"
+ - run-command API: have "run_processes_parallel{,_tr2}()" return void
+ - run-command tests: use "return", not "exit"
+ - run-command test helper: use "else if" pattern
+ - run-command tests: test stdout of run_command_parallel()
+ - submodule tests: reset "trace.out" between "grep" invocations
+ - hook tests: fix redirection logic error in 96e7225b310
 
- "git fsck" failed to release contents of tree objects already used
- from the memory, which has been fixed.
+ Move a global variable added as a hack during regression fixes to
+ its proper place in the API.
 
- Will merge to 'master'?
- source: <Yyw0PSVe3YTQGgRS@coredump.intra.peff.net>
+ Needs review.
+ source: <cover-00.15-00000000000-20220930T111343Z-avarab@gmail.com>
 
 
-* jk/remote-rename-without-fetch-refspec (2022-09-22) 1 commit
-  (merged to 'next' on 2022-09-27 at 165fe0a832)
- + remote: handle rename of remote without fetch refspec
+* nb/doc-mergetool-typofix (2022-10-05) 1 commit
+  (merged to 'next' on 2022-10-07 at d309a9a130)
+ + mergetool.txt: typofix 'overwriten' -> 'overwritten'
 
- "git remote rename" failed to rename a remote without fetch
- refspec, which has been corrected.
+ Typofix.
 
- Will merge to 'master'?
- source: <YyvzqZ5tmI0UdRAW@coredump.intra.peff.net>
+ Will merge to 'master'.
+ source: <pull.1350.git.git.1664844924663.gitgitgadget@gmail.com>
 
 
-* js/merge-ort-in-read-only-repo (2022-09-28) 2 commits
-  (merged to 'next' on 2022-09-29 at 84df46c1b4)
- + merge-ort: return early when failing to write a blob
- + merge-ort: fix segmentation fault in read-only repositories
+* rs/bisect-start-leakfix (2022-10-07) 1 commit
+ - bisect--helper: plug strvec leak
 
- In read-only repositories, "git merge-tree" tried to come up with a
- merge result tree object, which it failed (which is not wrong) and
- led to a segfault (which is bad), which has been corrected.
+ Code clean-up that results in plugging a leak.
 
- Will merge to 'master'?
- source: <pull.1362.v5.git.1664350162.gitgitgadget@gmail.com>
+ Will merge to 'next'.
+ source: <1965b54b-122a-c965-f886-1a7dd6afbfb4@web.de>
 
 
-* mc/cred-helper-ignore-unknown (2022-09-22) 3 commits
-  (merged to 'next' on 2022-09-27 at ce6e3616aa)
- + osxkeychain: clarify that we ignore unknown lines
- + netrc: ignore unknown lines (do not die)
- + wincred: ignore unknown lines (do not die)
+* rs/gc-pack-refs-simplify (2022-10-05) 1 commit
+  (merged to 'next' on 2022-10-07 at ef7d12408d)
+ + gc: simplify maintenance_task_pack_refs()
 
- Most credential helpers ignored unknown entries in a credential
- description, but a few died upon seeing them.  The latter were
- taught to ignore them, too
+ Code clean-up.
 
- Will merge to 'master'?
- source: <pull.1363.git.1663865974.gitgitgadget@gmail.com>
+ Will merge to 'master'.
+ source: <ab33f72e-d552-7bd7-bf04-3c476d32b5b6@web.de>
 
 
-* es/retire-efgrep (2022-09-23) 2 commits
-  (merged to 'next' on 2022-09-27 at 344fdd138e)
- + check-non-portable-shell: detect obsolescent egrep/fgrep
- + Merge branch 'dd/retire-efgrep' into es/retire-efgrep
- (this branch uses dd/retire-efgrep.)
+* rs/test-httpd-in-C-locale (2022-10-06) 1 commit
+  (merged to 'next' on 2022-10-07 at 832c1e856a)
+ + t/lib-httpd: pass LANG and LC_ALL to Apache
 
- Prepare for GNU [ef]grep that throw warning of their uses.
+ Force C locale while running tests around httpd to make sure we can
+ find expected error messages in the log.
 
  Will merge to 'master'.
- source: <pull.1338.git.git.1663805905554.gitgitgadget@gmail.com>
+ source: <a1699375-c660-13ab-42fb-26a8afe4c376@web.de>
 
 
-* vd/fix-unaligned-read-index-v4 (2022-09-28) 1 commit
-  (merged to 'next' on 2022-09-28 at 5b3425fd58)
- + read-cache: avoid misaligned reads in index v4
+* ab/unused-annotation (2022-10-05) 1 commit
+ - git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
 
- The codepath that reads from the index v4 had unaligned memory
- accesses, which has been corrected.
+ Compilation fix for ancient compilers.
 
- Will merge to 'master'.
- source: <pull.1366.v2.git.1664385541084.gitgitgadget@gmail.com>
+ Will merge to 'next'.
+ source: <20221005221928.703750-1-asedeno@google.com>
 
 
-* dd/retire-efgrep (2022-09-21) 4 commits
-  (merged to 'next' on 2022-09-21 at 22bc339be1)
- + t: convert fgrep usage to "grep -F"
- + t: convert egrep usage to "grep -E"
- + t: remove \{m,n\} from BRE grep usage
- + CodingGuidelines: allow grep -E
- (this branch is used by es/retire-efgrep.)
+* dd/document-runtime-prefix-better (2022-10-05) 1 commit
+ - Makefile: clarify runtime relative gitexecdir
 
- Prepare for GNU [ef]grep that throw warning of their uses.
+ Doc updates.
 
- Will merge to 'master'.
- source: <cover.1663765176.git.congdanhqx@gmail.com>
+ Will merge to 'next'.
+ source: <20221006013205.15015-1-congdanhqx@gmail.com>
 
 
-* tb/midx-repack-ignore-cruft-packs (2022-09-21) 7 commits
-  (merged to 'next' on 2022-09-29 at 55474c6ecc)
- + midx.c: avoid cruft packs with non-zero `repack --batch-size`
- + midx.c: remove unnecessary loop condition
- + midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
- + midx.c: avoid cruft packs with `repack --batch-size=0`
- + midx.c: prevent `expire` from removing the cruft pack
- + Documentation/git-multi-pack-index.txt: clarify expire behavior
- + Documentation/git-multi-pack-index.txt: fix typo
+* jk/cleanup-callback-parameters (2022-10-06) 4 commits
+ - attr: drop DEBUG_ATTR code
+ - commit: avoid writing to global in option callback
+ - multi-pack-index: avoid writing to global in option callback
+ - test-submodule: inline resolve_relative_url() function
 
- "git multi-pack-index repack/expire" used to repack unreachable
- cruft into a new pack, which have been corrected.
+ Code clean-up.
 
- Will merge to 'master'?
- cf. <63a1c3d4-eff3-af10-4263-058c88e74594@github.com>
- source: <cover.1663638929.git.me@ttaylorr.com>
+ Will merge to 'next'.
+ source: <Yz7Tjy7Rh8cXVxYQ@coredump.intra.peff.net>
+ source: <Yz7UhYXvNl6+1GbZ@coredump.intra.peff.net>
 
 
-* ah/fsmonitor-daemon-usage-non-l10n (2022-09-21) 1 commit
-  (merged to 'next' on 2022-09-21 at bc69a73c6c)
- + fsmonitor--daemon: don't translate literal commands
+* pw/test-todo (2022-10-06) 3 commits
+ - test_todo: allow [verbose] test as the command
+ - test_todo: allow [!] grep as the command
+ - tests: add test_todo() to mark known breakages
 
- Fix messages incorrectly marked for translation.
+ RFC for test framework improvement.
 
- Will merge to 'master'?
- source: <20220920050709.326359-1-alexhenrie24@gmail.com>
+ Needs review.
+ source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
 
 
-* so/diff-merges-cleanup (2022-09-16) 3 commits
-  (merged to 'next' on 2022-09-22 at 57694bbed7)
- + diff-merges: clarify log.diffMerges documentation
- + diff-merges: cleanup set_diff_merges()
- + diff-merges: cleanup func_by_opt()
+* jc/tmp-objdir (2022-09-30) 1 commit
+ - tmp-objdir: skip clean up when handling a signal
 
- Code clean-up.
+ The code to clean temporary object directories (used for
+ quarantine) tried to remove them inside its signal handler, which
+ was a no-no.
 
- Will merge to 'master'?
- source: <20220914193102.5275-1-sorganov@gmail.com>
+ Will merge to 'next'.
+ source: <pull.1348.v4.git.git.1664570831583.gitgitgadget@gmail.com>
 
 
-* ja/rebase-i-avoid-amending-self (2022-09-26) 1 commit
-  (merged to 'next' on 2022-09-29 at 2635f37dae)
- + sequencer: avoid dropping fixup commit that targets self via commit-ish
+* jc/branch-description-unset (2022-09-30) 1 commit
+ - branch: do not fail a no-op --edit-desc
 
- "git rebase -i" can mistakenly attempt to apply a fixup to a commit
- itself, which has been corrected.
+ "GIT_EDITOR=: git branch --edit-description" resulted in failure,
+ which has been corrected.
 
- Will merge to 'master'?
- source: <20220924222904.1784975-1-aclopte@gmail.com>
+ Will merge to 'next'.
+ source: <xmqqmtagka8x.fsf@gitster.g>
 
 
-* ac/fuzzers (2022-09-19) 1 commit
-  (merged to 'next' on 2022-09-29 at 600f45a53b)
- + fuzz: reorganise the path for existing oss-fuzz fuzzers
+* rj/branch-edit-desc-unborn (2022-10-07) 1 commit
+ - branch: description for non-existent branch errors
 
- Source file shuffling.
+ "git branch --edit-description" on an unborh branch misleadingly
+ said that no such branch exists, which has been corrected.
 
- Will merge to 'master'.
- source: <pull.1353.v4.git.1663598215154.gitgitgadget@gmail.com>
+ Will merge to 'next'.
+ source: <8d627a2c-923f-181f-a03b-15f370c4dd0f@gmail.com>
 
 
-* hn/parse-worktree-ref (2022-09-19) 1 commit
-  (merged to 'next' on 2022-09-29 at 1f4453eb83)
- + refs: unify parse_worktree_ref() and ref_type()
+* jt/promisor-remote-fetch-tweak (2022-10-05) 2 commits
+ - promisor-remote: die upon failing fetch
+ - promisor-remote: remove a return value
 
- Code and semantics cleaning.
+ Remove error detection from a function that fetches from promisor
+ remotes, and make it die when such a fetch fails to bring all the
+ requested objects, to give an early failure to various operations.
 
- Will merge to 'master'?
- source: <pull.1325.v2.git.git.1663605291172.gitgitgadget@gmail.com>
+ Will merge to 'next'.
+ source: <cover.1664917853.git.jonathantanmy@google.com>
 
 
 * ed/fsmonitor-on-networked-macos (2022-10-05) 6 commits
- - fsmonitor: add documentation for allowRemote and socketDir options
- - fsmonitor: check for compatability before communicating with fsmonitor
- - fsmonitor: deal with synthetic firmlinks on macOS
- - fsmonitor: avoid socket location check if using hook
- - fsmonitor: relocate socket file if .git directory is remote
- - fsmonitor: refactor filesystem checks to common interface
+  (merged to 'next' on 2022-10-07 at fe9f182bde)
+ + fsmonitor: add documentation for allowRemote and socketDir options
+ + fsmonitor: check for compatability before communicating with fsmonitor
+ + fsmonitor: deal with synthetic firmlinks on macOS
+ + fsmonitor: avoid socket location check if using hook
+ + fsmonitor: relocate socket file if .git directory is remote
+ + fsmonitor: refactor filesystem checks to common interface
+ (this branch is used by ed/fsmonitor-inotify.)
 
  By default, use of fsmonitor on a repository on networked
  filesystem is disabled. Add knobs to make it workable on macOS.
 
- Will merge to 'next'.
+ Will merge to 'master'.
  source: <pull.1326.v15.git.1664904751.gitgitgadget@gmail.com>
 
 
-* rj/branch-edit-description-with-nth-checkout (2022-09-12) 2 commits
- - branch: support for shortcuts like @{-1} completed
- - branch: refactor "edit_description" code path
+* rj/branch-edit-description-with-nth-checkout (2022-10-09) 2 commits
+ - SQUASH???
+ - branch: support for shortcuts like @{-1}, completed
 
  "git branch --edit-description @{-1}" is now a way to edit branch
  description of the branch you were on before switching to the
  current branch.
 
- Needs review.
- source: <7abdb5a9-5707-7897-4196-8d2892beeb81@gmail.com>
-
-
-* mj/credential-helper-auth-headers (2022-09-13) 8 commits
- - http: set specific auth scheme depending on credential
- - http: move proactive auth to first slot creation
- - http: store all request headers on active_request_slot
- - credential: add WWW-Authenticate header to cred requests
- - http: read HTTP WWW-Authenticate response headers
- - osxkeychain: clarify that we ignore unknown lines
- - netrc: ignore unknown lines (do not die)
- - wincred: ignore unknown lines (do not die)
-
- Extending credential helper protocol.
-
  Expecting a reroll.
- A separate non-RFC submission of the first three is expected.
- cf. <AS8PR03MB86897FAC3E1E4F03D4420644C04F9@AS8PR03MB8689.eurprd03.prod.outlook.com>
- source: <pull.1352.git.1663097156.gitgitgadget@gmail.com>
-
-
-* jc/environ-docs (2022-09-16) 5 commits
-  (merged to 'next' on 2022-09-29 at a0a43b8de5)
- + environ: GIT_INDEX_VERSION affects not just a new repository
- + environ: simplify description of GIT_INDEX_FILE
- + environ: GIT_FLUSH should be made a usual Boolean
- + environ: explain Boolean environment variables
- + environ: document GIT_SSL_NO_VERIFY
-
- Documentation on various Boolean GIT_* environment variables have
- been clarified.
-
- Will merge to 'master'?
- source: <20220915160659.126441-1-gitster@pobox.com>
+ source: <de200fa0-379d-c1ce-8446-9e4292d0b66a@gmail.com>
 
 
 * rs/diff-caret-bang-with-parents (2022-10-01) 3 commits
@@ -625,58 +830,11 @@ Release tarballs are available at:
  source: <cover-v2-0.9-00000000000-20220831T205130Z-avarab@gmail.com>
 
 
-* tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit
- - diff.c: use utf8_strwidth() to count display width
-
- "git diff --stat" etc. were invented back when everything was ASCII
- and strlen() was a way to measure the display width of a string;
- adjust them to compute the display width assuming UTF-8 pathnames.
-
- Expecting a reroll.
- source: <20220914151333.3309-1-tboegi@web.de>
-
-
-* gc/submodule-clone-update-with-branches (2022-08-29) 6 commits
- - clone, submodule update: check out branches
- - submodule--helper: refactor up-to-date criterion
- - submodule: return target of submodule symref
- - t5617: drop references to remote-tracking branches
- - repo-settings: add submodule_propagate_branches
- - clone: teach --detach option
-
- "git clone --recurse-submodules" and "git submodule update" learns
- to honor the "propagete branches" option.
-
- Expecting a reroll.
- cf. <20220901200047.515294-1-jonathantanmy@google.com> and others
- source: <pull.1321.git.git.1661806456.gitgitgadget@gmail.com>
-
-
-* sy/sparse-grep (2022-09-23) 1 commit
-  (merged to 'next' on 2022-09-29 at a5bc34b9c5)
- + builtin/grep.c: integrate with sparse index
-
- "git grep" learned to expand the sparse-index more lazily and on
- demand in a sparse checkout.
-
- Will merge to 'master'?
- source: <20220923041842.27817-2-shaoxuan.yuan02@gmail.com>
-
-
-* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
-  (merged to 'next' on 2022-09-14 at 80905596d8)
- + grep: fix multibyte regex handling under macOS
-
- With a bit of header twiddling, use the native regexp library on
- macOS instead of the compat/ one.
-
- Will merge to 'master'.
- source: <20220826085815.2771102-1-dds@aueb.gr>
-
-
-* ds/bundle-uri-3 (2022-10-05) 10 commits
+* ds/bundle-uri-3 (2022-10-10) 12 commits
  - bundle-uri: suppress stderr from remote-https
+ - bundle-uri: quiet failed unbundlings
  - bundle-uri: fetch a list of bundles
+ - bundle: add flags to verify_bundle(), skip walk
  - bundle-uri: limit recursion depth for bundle lists
  - bundle-uri: parse bundle list in config format
  - bundle-uri: unit test "key=value" parsing
@@ -691,80 +849,7 @@ Release tarballs are available at:
  them.
 
  Needs review.
- source: <pull.1333.v3.git.1664886860.gitgitgadget@gmail.com>
-
-
-* js/cmake-updates (2022-08-24) 5 commits
- - cmake: increase time-out for a long-running test
- - cmake: avoid editing t/test-lib.sh
- - add -p: avoid ambiguous signed/unsigned comparison
- - cmake: copy the merge tools for testing
- - cmake: make it easier to diagnose regressions in CTest runs
-
- Update to build procedure with VS using CMake/CTest.
-
- Expecting a reroll.
- cf. <3df77ffd-85a2-3a54-9005-34a24ec6e82d@github.com>
- cf. <531620e1-de4c-74aa-c840-c12ce81f8740@github.com> and others
- source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
-
-
-* pw/rebase-keep-base-fixes (2022-09-07) 7 commits
- - rebase --keep-base: imply --no-fork-point
- - rebase --keep-base: imply --reapply-cherry-picks
- - rebase: factor out branch_base calculation
- - rebase: rename merge_base to branch_base
- - rebase: store orig_head as a commit
- - t3416: set $EDITOR in subshell
- - t3416: tighten two tests
-
- "git rebase --keep-base" used to discard the commits that are
- already cherry-picked to the upstream, even when "keep-base" meant
- that the base, on top of which the history is being rebuilt, does
- not yet include these cherry-picked commits.  The --keep-base
- option now implies --reapply-cherry-picks and --no-fork-point
- options.
-
- Expecting a reroll.
- cf. <e25127f3-6135-b716-a12f-5dbe4f40dc42@gmail.com>
- source: <pull.1323.v2.git.1662561470.gitgitgadget@gmail.com>
-
-
-* ag/merge-strategies-in-c (2022-08-10) 14 commits
- - sequencer: use the "octopus" strategy without forking
- - sequencer: use the "resolve" strategy without forking
- - merge: use the "octopus" strategy without forking
- - merge: use the "resolve" strategy without forking
- - merge-octopus: rewrite in C
- - merge-recursive: move better_branch_name() to merge.c
- - merge-resolve: rewrite in C
- - merge-one-file: rewrite in C
- - update-index: move add_cacheinfo() to read-cache.c
- - merge-index: add a new way to invoke `git-merge-one-file'
- - merge-index: drop the index
- - merge-index: libify merge_one_path() and merge_all()
- - t6060: add tests for removed files
- - t6060: modify multiple files to expose a possible issue with merge-index
-
- An attempt to rewrite remaining merge strategies from shell to C.
-
- Needs more work.
- At the minimum, we should lose 11/14 and possibly 08/14.
- cf. <xmqq7d36vfur.fsf@gitster.g>
- source: <20220809185429.20098-1-alban.gruin@gmail.com>
-
-
-* po/glossary-around-traversal (2022-07-09) 3 commits
- - glossary: add reachability bitmap description
- - glossary: add commit graph description
- - glossary: add Object DataBase (ODB) abbreviation
-
- The glossary entries for "commit-graph file" and "reachability
- bitmap" have been added.
-
- Expecting a reroll.
- cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email>
- source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
+ source: <pull.1333.v4.git.1665417859.gitgitgadget@gmail.com>
 
 
 * js/bisect-in-c (2022-08-30) 17 commits