To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Aug 2020, #04; Tue, 18)
-X-master-at: 2befe97201e1f3175cce557866c5822793624b5a
-X-next-at: 76ed4a4daf6aec5583ad1c21b86f032a08bf353f
+Subject: What's cooking in git.git (Aug 2020, #05; Fri, 21)
+X-master-at: 675a4aaf3b226c0089108221b96559e0baae5de9
+X-next-at: ade71fd49b68a1c786ec40be7b66ba922c60ee98
-What's cooking in git.git (Aug 2020, #04; Tue, 18)
+What's cooking in git.git (Aug 2020, #05; Fri, 21)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
--------------------------------------------------
[Graduated to 'master']
-* al/bisect-first-parent (2020-08-07) 5 commits
- (merged to 'next' on 2020-08-11 at b232f7ca17)
- + bisect: combine args passed to find_bisection()
- + bisect: introduce first-parent flag
- + cmd_bisect__helper: defer parsing no-checkout flag
- + rev-list: allow bisect and first-parent flags
- + t6030: modernize "git bisect run" tests
-
- "git bisect" learns the "--first-parent" option to find the first
- breakage along the first-parent chain.
-
-
-* dd/send-email-config (2020-07-23) 1 commit
- (merged to 'next' on 2020-08-11 at aaf9f3a301)
- + git-send-email: die if sendmail.* config is set
-
- Stop when "sendmail.*" configuration variables are defined, which
- could be a mistaken attempt to define "sendemail.*" variables.
-
-
-* es/test-cmp-typocatcher (2020-08-09) 1 commit
- (merged to 'next' on 2020-08-11 at ee5557b170)
- + test_cmp: diagnose incorrect arguments
-
- Test framework update.
-
-
-* hn/reftable-prep-part-2 (2020-07-27) 3 commits
- (merged to 'next' on 2020-08-11 at 43ac0bc60a)
- + Make HEAD a PSEUDOREF rather than PER_WORKTREE.
- + Modify pseudo refs through ref backend storage
- + t1400: use git rev-parse for testing PSEUDOREF existence
-
- Further preliminary change to refs API.
-
-
-* jc/noop-with-static-inline (2020-08-06) 1 commit
- (merged to 'next' on 2020-08-11 at 8a63ff648e)
- + compat-util: type-check parameters of no-op replacement functions
-
- A no-op replacement function implemented as a C preprocessor macro
- does not perform as good a job as one implemented as a "static
- inline" function in catching errors in parameters; replace the
- former with the latter in <git-compat-util.h> header.
-
-
-* jk/log-fp-implies-m (2020-07-29) 7 commits
- (merged to 'next' on 2020-08-03 at 39fefa6b82)
- + doc/git-log: clarify handling of merge commit diffs
- + doc/git-log: move "-t" into diff-options list
- + doc/git-log: drop "-r" diff option
- + doc/git-log: move "Diff Formatting" from rev-list-options
- + log: enable "-m" automatically with "--first-parent"
- + revision: add "--no-diff-merges" option to counteract "-m"
- + log: drop "--cc implies -m" logic
- (this branch is used by so/log-diff-merges-opt.)
-
- Originally merged to 'next' on 2020-08-01
+* ak/sequencer-fix-find-uniq-abbrev (2020-08-13) 1 commit
+ (merged to 'next' on 2020-08-17 at 6ce0f1d111)
+ + rebase -i: fix possibly wrong onto hash in todo
- "git log --first-parent -p" showed patches only for single-parent
- commits on the first-parent chain; the "--first-parent" option has
- been made to imply "-m". Use "--no-diff-merges" to restore the
- previous behaviour to omit patches for merge commits.
+ Ring buffer with size 4 used for bin-hex translation resulted in a
+ wrong object name in the sequencer's todo output, which has been
+ corrected.
- Will merge to 'master' together with 'so/log-diff-merges-opt'
+* bc/sha-256-doc-updates (2020-08-13) 2 commits
+ (merged to 'next' on 2020-08-17 at 7154a0ce3c)
+ + docs: fix step in transition plan
+ + docs: document SHA-256 pack and indices
-* jk/sideband-error-l10n (2020-08-07) 1 commit
- (merged to 'next' on 2020-08-11 at 27dbe05a65)
- + sideband: mark "remote error:" prefix for translation
+ Further update of docs to adjust to the recent SHA-256 work.
- Mark error message for i18n.
+* ds/sha256-leftover-bits (2020-08-17) 3 commits
+ (merged to 'next' on 2020-08-17 at a8e6f9f3f4)
+ + multi-pack-index: use hash version byte
+ + commit-graph: use the "hash version" byte
+ + t/README: document GIT_TEST_DEFAULT_HASH
-* ma/stop-progress-null-fix (2020-08-10) 1 commit
- (merged to 'next' on 2020-08-13 at 8bdec5209f)
- + progress: don't dereference before checking for NULL
+ midx and commit-graph files now use the byte defined in their file
+ format specification for identifying the hash function used for
+ object names.
- NULL dereference fix.
+* en/merge-tests (2020-08-10) 11 commits
+ (merged to 'next' on 2020-08-13 at eab952350b)
+ + t6425: be more flexible with rename/delete conflict messages
+ + t642[23]: be more flexible for add/add conflicts involving pair renames
+ + t6422, t6426: be more flexible for add/add conflicts involving renames
+ + t6423: add an explanation about why one of the tests does not pass
+ + t6416, t6423: clarify some comments and fix some typos
+ + t6422: fix multiple errors with the mod6 test expectations
+ + t6423: fix test setup for a couple tests
+ + t6416, t6422: fix incorrect untracked file count
+ + t6422: fix bad check against missing file
+ + t6418: tighten delete/normalize conflict testcase
+ + Collect merge-related tests to t64xx
-* pd/mergetool-nvimdiff (2020-07-29) 2 commits
- (merged to 'next' on 2020-08-11 at 947ce686d0)
- + mergetools: add support for nvimdiff (neovim) family
- + mergetool--lib: improve support for vimdiff-style tool variants
+ Updates to "git merge" tests, in preparation for a new merge
+ strategy backend.
- The existing backends for "git mergetool" based on variants of vim
- have been refactored and then support for "nvim" has been added.
+* en/sequencer-merge-labels (2020-08-14) 1 commit
+ (merged to 'next' on 2020-08-17 at 2010e329ed)
+ + sequencer: avoid garbled merge machinery messages due to commit labels
-* ps/ref-transaction-hook (2020-08-11) 2 commits
- (merged to 'next' on 2020-08-11 at 311c045810)
- + t1416: avoid hard-coded sha1 ids
- (merged to 'next' on 2020-08-10 at d8ad7cc8f6)
- + refs: fix interleaving hook calls with reference-transaction hook
+ The commit labels used to explain each side of conflicted hunks
+ placed by the sequencer machinery have been made more readable by
+ humans.
- The logic to find the ref transaction hook script attempted to
- cache the path to the found hook without realizing that it needed
- to keep a copied value, as the API it used returned a transitory
- buffer space. This has been corrected.
- to be followed by a removal of the caching feature, which does not
- seem to help even as a negative cache.
+* jb/commit-graph-doc-fix (2020-08-13) 1 commit
+ (merged to 'next' on 2020-08-17 at d83ee98955)
+ + docs: commit-graph: fix some whitespace in the diagram
-* rp/apply-cached-with-i-t-a (2020-08-09) 3 commits
- (merged to 'next' on 2020-08-11 at c28eaa6a0e)
- + t4140: test apply with i-t-a paths
- + apply: make i-t-a entries never match worktree
- + apply: allow "new file" patches on i-t-a entries
+ Docfix.
- Recent versions of "git diff-files" shows a diff between the index
- and the working tree for "intent-to-add" paths as a "new file"
- patch; "git apply --cached" should be able to take "git diff-files"
- and should act as an equivalent to "git add" for the path, but the
- command failed to do so for such a path.
+* jc/object-names-are-not-sha-1 (2020-08-14) 1 commit
+ (merged to 'next' on 2020-08-17 at 400fe9e831)
+ + messages: avoid SHA-1 in end-user facing messages
-* so/log-diff-merges-opt (2020-08-11) 3 commits
- (merged to 'next' on 2020-08-11 at 99e070bdca)
- + t/t4013: add test for --diff-merges=off
- + doc/git-log: describe --diff-merges=off
- + revision: change "--diff-merges" option to require parameter
- (this branch uses jk/log-fp-implies-m.)
+ A few end-user facing messages have been updated to be
+ hash-algorithm agnostic.
- Earlier, to countermand the implicit "-m" option when the
- "--first-parent" option is used with "git log", we added the
- "--[no-]diff-merges" option in the jk/log-fp-implies-m topic. To
- leave the door open to allow the "--diff-merges" option to take
- values that instructs how patches for merge commits should be
- computed (e.g. "cc"? "-p against first parent?"), redefine
- "--diff-merges" to take non-optional value, and implement "off"
- that means the same thing as "--no-diff-merges".
- Will merge to 'master' together with 'jk/lo-implies-m'.
+* jh/mingw-unlink (2020-08-17) 1 commit
+ (merged to 'next' on 2020-08-17 at fb53a3d1a1)
+ + mingw: improve performance of mingw_unlink()
---------------------------------------------------
-[New Topics]
+ "unlink" emulation on MinGW has been optimized.
-* bc/sha-256-doc-updates (2020-08-13) 2 commits
- (merged to 'next' on 2020-08-17 at 7154a0ce3c)
- + docs: fix step in transition plan
- + docs: document SHA-256 pack and indices
- Further update of docs to adjust to the recent SHA-256 work.
+* jk/blame-coalesce-fix (2020-08-13) 3 commits
+ (merged to 'next' on 2020-08-17 at 122c701ec7)
+ + blame: only coalesce lines that are adjacent in result
+ + t8003: factor setup out of coalesce test
+ + t8003: check output of coalesced blame
- Will merge to 'master'.
+ When given more than one target line ranges, "git blame -La,b
+ -Lc,d" was over-eager to coalesce groups of original lines and
+ showed incorrect results, which has been corrected.
* ma/sha-256-docs (2020-08-17) 4 commits
Further update of docs to adjust to the recent SHA-256 work.
- Will merge to 'master'.
-
-
-* dd/diff-customize-index-line-abbrev (2020-08-13) 2 commits
- - diff: index-line: respect --abbrev in object's name
- - revision: differentiate if --no-abbrev asked explicitly
-
- The output from the "diff" family of the commands had abbreviated
- object names of blobs involved in the patch, but its length was not
- affected by the --abbrev option. Now it is.
-
- The first patch is unneeded.
+* pb/set-url-docfix (2020-08-13) 1 commit
+ (merged to 'next' on 2020-08-17 at 19b56c6ebb)
+ + fetch, pull doc: correct description of '--set-upstream'
-* ds/sha256-leftover-bits (2020-08-17) 3 commits
- (merged to 'next' on 2020-08-17 at a8e6f9f3f4)
- + multi-pack-index: use hash version byte
- + commit-graph: use the "hash version" byte
- + t/README: document GIT_TEST_DEFAULT_HASH
+ Doc fix.
- midx and commit-graph files now use the byte defined in their file
- format specification for identifying the hash function used for
- object names.
- Will merge to 'master'.
+* pb/userdiff-fortran-update (2020-08-13) 2 commits
+ (merged to 'next' on 2020-08-17 at 534af3f35a)
+ + userdiff: improve Fortran xfuncname regex
+ + userdiff: add tests for Fortran xfuncname regex
+ The regexp to identify the function boundary for FORTRAN programs
+ has been updated.
-* hn/refs-fetch-head-is-special (2020-08-17) 4 commits
- - refs: read FETCH_HEAD generically
- - refs: move gitdir into base ref_store
- - refs: fix comment about submodule ref_stores
- - Split off reading loose ref data in separate function
- (this branch is used by hn/refs-pseudorefs.)
- The FETCH_HEAD is now always read from the filesystem regardless of
- the ref backend in use, as its format is much richer than the
- normal refs, and written directly by "git fetch" as a plain file..
+* rp/ita-diff-modefix (2020-08-09) 1 commit
+ (merged to 'next' on 2020-08-17 at c03a9cfb6e)
+ + diff-lib: use worktree mode in diffs from i-t-a entries
+ "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
+ bit was not showing the mode bits from the working tree.
-* hv/ref-filter-misc (2020-08-17) 9 commits
- - ref-filter: add `sanitize` option for 'subject' atom
- - format-support: move `format_sanitized_subject()` from pretty
- - pretty: refactor `format_sanitized_subject()`
- - ref-filter: add `short` modifier to 'parent' atom
- - ref-filter: add `short` modifier to 'tree' atom
- - ref-filter: rename `objectname` related functions and fields
- - ref-filter: modify error messages in `grab_objectname()`
- - ref-filter: refactor `grab_objectname()`
- - ref-filter: support different email formats
- The "--format=" option to the "for-each-ref" command and friends
- learned a few more tricks, e.g. the ":short" suffix that applies to
- "objectname" now also can be used for "parent", "tree", etc.
+* rs/preserve-merges-unused-code-removal (2020-08-12) 1 commit
+ (merged to 'next' on 2020-08-17 at b96393455c)
+ + rebase: remove unused function reschedule_last_action
+ Code clean-up.
-* jc/object-names-are-not-sha-1 (2020-08-14) 1 commit
- (merged to 'next' on 2020-08-17 at 400fe9e831)
- + messages: avoid SHA-1 in end-user facing messages
- A few end-user facing messages have been update to be
- hash-algorithm agnostic.
+* rs/upload-pack-sigchain-fix (2020-08-11) 1 commit
+ (merged to 'next' on 2020-08-17 at 997473f309)
+ + upload-pack: remove superfluous sigchain_pop() call
- Will merge to 'master'.
+ Code clean-up.
+--------------------------------------------------
+[New Topics]
-* jh/mingw-unlink (2020-08-17) 1 commit
- (merged to 'next' on 2020-08-17 at fb53a3d1a1)
- + mingw: improve performance of mingw_unlink()
+* en/dir-clear (2020-08-18) 2 commits
+ (merged to 'next' on 2020-08-19 at 18c5b69293)
+ + dir: fix problematic API to avoid memory leaks
+ + dir: make clear_directory() free all relevant memory
- "unlink" emulation on MinGW has been optimized.
+ Leakfix with code clean-up.
Will merge to 'master'.
-* jk/leakfix (2020-08-17) 7 commits
- - submodule--helper: fix leak of core.worktree value
- - config: fix leak in git_config_get_expiry_in_days()
- - config: drop git_config_get_string_const()
- - config: fix leaks from git_config_get_string_const()
- - checkout: fix leak of non-existent branch names
- - submodule--helper: use strbuf_release() to free strbufs
- - clear_pattern_list(): clear embedded hashmaps
+* hn/refs-pseudorefs (2020-08-21) 4 commits
+ - sequencer: treat REVERT_HEAD as a pseudo ref
+ - builtin/commit: suggest update-ref for pseudoref removal
+ - sequencer: treat CHERRY_PICK_HEAD as a pseudo ref
+ - refs: make refs_ref_exists public
+ (this branch uses hn/refs-fetch-head-is-special.)
- Code clean-up.
+ Accesses to two pseudorefs have been updated to properly use ref
+ API.
Will merge to 'next'.
-* jk/refspecs-negative (2020-08-17) 3 commits
- - refspec: add support for negative refspecs
- - refspec: make sure stack refspec_item variables are zeroed
- - refspec: fix documentation referring to refspec_item
+* rs/patch-id-with-incomplete-line (2020-08-18) 1 commit
+ (merged to 'next' on 2020-08-19 at 72961d48d0)
+ + patch-id: ignore newline at end of file in diff_flush_patch_id()
- "negative refspecs"
-
-
-* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-14) 1 commit
- - fetch-pack: make packfile URIs work with transfer.fsckobjects
+ The patch-id computation did not ignore the "incomplete last line"
+ marker like whitespaces.
- Bugfix for "git fetch" when the packfile URI capability is in use.
+ Will merge to 'master'.
- Need to pick up a reroll.
+* rz/complete-more-options (2020-08-19) 2 commits
+ (merged to 'next' on 2020-08-21 at ba8f4c8cb1)
+ + completion: add GIT_COMPLETION_SHOW_ALL env var
+ + parse-options: add --git-completion-helper-all
-* mr/diff-hide-stat-wo-textual-change (2020-08-17) 1 commit
- - diff: teach --stat to ignore uninteresting modifications
-
- Expecting a reroll.
+ Command line completion (in contrib/) usually omits redundant,
+ deprecated and/or dangerous options from its output; it learned to
+ optionally include all of them.
+ Will merge to 'master'.
-* pw/add-p-allowed-options-fix (2020-08-17) 2 commits
- - add -p: fix checking of user input
- - add -p: use ALLOC_GROW_BY instead of ALLOW_GROW
- "git add -p" update.
+* jt/promisor-pack-fix (2020-08-20) 1 commit
+ - fetch-pack: in partial clone, pass --promisor
- Doubts?
- cf. <pull.702.git.1597670589.gitgitgadget@gmail.com>
+ Updates into a lazy/partial clone with a submodule did not work
+ well with transfer.fsckobjects set.
-* dl/subtree-docs (2020-08-18) 2 commits
- - contrib/subtree: document 'push' does not take '--squash'
- - contrib/subtree: fix "unsure" for --message in the document
+* hv/ref-filter-trailers-atom-parsing-fix (2020-08-21) 2 commits
+ - ref-filter: 'contents:trailers' show error if `:` is missing
+ - t6300: unify %(trailers) and %(contents:trailers) tests
- Doc updates for subtree (in contrib/)
+ The parser for "git for-each-ref --format=..." was too loose when
+ parsing the "%(trailers...)" atom, and forgot that "trailers" and
+ "trailers:<modifers>" are the only two allowed forms, which has
+ been corrected.
Will merge to 'next'.
-* en/mem-pool (2020-08-18) 3 commits
- - mem-pool: use consistent pool variable name
- - mem-pool: use more standard initialization and finalization
- - mem-pool: add convenience functions for strdup and strndup
+* jc/ident-whose-ident (2020-08-21) 1 commit
+ - ident: say whose identity is missing when giving user.name hint
- API update.
+ Error message update.
- Will merge to 'next'.
+* jk/index-pack-w-more-threads (2020-08-21) 3 commits
+ - index-pack: adjust default threading cap
+ - p5302: count up to online-cpus for thread tests
+ - p5302: disable thread-count parameter tests by default
-* jc/no-update-fetch-head (2020-08-18) 1 commit
- - fetch: optionally allow disabling FETCH_HEAD update
- (this branch is used by ds/maintenance-part-1, ds/maintenance-part-2 and jt/lazy-fetch.)
-
- "git fetch" learned --no-write-fetch-head option to avoid writing
- the FETCH_HEAD file.
+ Long ago, we decided to use 3 threads by default when running the
+ index-pack task in parallel, which has been adjusted a bit upwards.
Will merge to 'next'.
-* jt/lazy-fetch (2020-08-18) 7 commits
- - fetch-pack: remove no_dependents code
- - promisor-remote: lazy-fetch objects in subprocess
- - fetch-pack: do not lazy-fetch during ref iteration
- - fetch: only populate existing_refs if needed
- - fetch: avoid reading submodule config until needed
- - fetch: allow refspecs specified through stdin
- - negotiator/noop: add noop fetch negotiator
- (this branch uses jc/no-update-fetch-head; is tangled with ds/maintenance-part-1 and ds/maintenance-part-2.)
-
- Updates to on-demand fetching code in lazily cloned repositories.
-
-
-
-* mt/checkout-entry-dead-code-removal (2020-08-18) 1 commit
- - checkout_entry(): remove unreachable error() call
+* rp/apply-cached-doc (2020-08-20) 1 commit
+ - git-apply.txt: update descriptions of --cached, --index
- Code clean-up.
-
- Will merge to 'next'.
+ The description of --cached/--index options in "git apply --help"
+ has been updated.
--------------------------------------------------
[Stalled]
--------------------------------------------------
[Cooking]
+* dd/diff-customize-index-line-abbrev (2020-08-21) 2 commits
+ - diff: index-line: respect --abbrev in object's name
+ - t4013: improve diff-post-processor logic
+
+ The output from the "diff" family of the commands had abbreviated
+ object names of blobs involved in the patch, but its length was not
+ affected by the --abbrev option. Now it is.
+
+ Will merge to 'next'.
+
+
+* hn/refs-fetch-head-is-special (2020-08-19) 4 commits
+ (merged to 'next' on 2020-08-21 at def233ab43)
+ + refs: read FETCH_HEAD and MERGE_HEAD generically
+ + refs: move gitdir into base ref_store
+ + refs: fix comment about submodule ref_stores
+ + refs: split off reading loose ref data in separate function
+ (this branch is used by hn/refs-pseudorefs.)
+
+ The FETCH_HEAD is now always read from the filesystem regardless of
+ the ref backend in use, as its format is much richer than the
+ normal refs, and written directly by "git fetch" as a plain file..
+
+ Will merge to 'master'.
+
+
+* hv/ref-filter-misc (2020-08-17) 9 commits
+ - ref-filter: add `sanitize` option for 'subject' atom
+ - format-support: move `format_sanitized_subject()` from pretty
+ - pretty: refactor `format_sanitized_subject()`
+ - ref-filter: add `short` modifier to 'parent' atom
+ - ref-filter: add `short` modifier to 'tree' atom
+ - ref-filter: rename `objectname` related functions and fields
+ - ref-filter: modify error messages in `grab_objectname()`
+ - ref-filter: refactor `grab_objectname()`
+ - ref-filter: support different email formats
+
+ The "--format=" option to the "for-each-ref" command and friends
+ learned a few more tricks, e.g. the ":short" suffix that applies to
+ "objectname" now also can be used for "parent", "tree", etc.
+
+
+* jk/leakfix (2020-08-17) 7 commits
+ (merged to 'next' on 2020-08-21 at a8b25a2657)
+ + submodule--helper: fix leak of core.worktree value
+ + config: fix leak in git_config_get_expiry_in_days()
+ + config: drop git_config_get_string_const()
+ + config: fix leaks from git_config_get_string_const()
+ + checkout: fix leak of non-existent branch names
+ + submodule--helper: use strbuf_release() to free strbufs
+ + clear_pattern_list(): clear embedded hashmaps
+
+ Code clean-up.
+
+ Will merge to 'master'.
+
+
+* jk/refspecs-negative (2020-08-17) 3 commits
+ - refspec: add support for negative refspecs
+ - refspec: make sure stack refspec_item variables are zeroed
+ - refspec: fix documentation referring to refspec_item
+
+ "negative refspecs"
+
+
+* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-14) 1 commit
+ - fetch-pack: make packfile URIs work with transfer.fsckobjects
+
+ Bugfix for "git fetch" when the packfile URI capability is in use.
+
+ Need to pick up a reroll.
+
+
+* mr/diff-hide-stat-wo-textual-change (2020-08-19) 1 commit
+ - diff: teach --stat to ignore uninteresting modifications
+
+ Looking good.
+
+
+* pw/add-p-allowed-options-fix (2020-08-17) 2 commits
+ - add -p: fix checking of user input
+ - add -p: use ALLOC_GROW_BY instead of ALLOW_GROW
+
+ "git add -p" update.
+
+ Doubts?
+ cf. <pull.702.git.1597670589.gitgitgadget@gmail.com>
+ cf. <744e464f-6378-ef68-01c1-3b8bf63c54a4@gmail.com>
+
+
+* dl/subtree-docs (2020-08-18) 2 commits
+ (merged to 'next' on 2020-08-19 at e1a8ea9d46)
+ + contrib/subtree: document 'push' does not take '--squash'
+ + contrib/subtree: fix "unsure" for --message in the document
+
+ Doc updates for subtree (in contrib/)
+
+ Will merge to 'master'.
+
+
+* en/mem-pool (2020-08-18) 3 commits
+ (merged to 'next' on 2020-08-19 at eff9ad46f0)
+ + mem-pool: use consistent pool variable name
+ + mem-pool: use more standard initialization and finalization
+ + mem-pool: add convenience functions for strdup and strndup
+
+ API update.
+
+ Will merge to 'master'.
+
+
+* jc/no-update-fetch-head (2020-08-18) 1 commit
+ (merged to 'next' on 2020-08-19 at 68e1374ed6)
+ + fetch: optionally allow disabling FETCH_HEAD update
+ (this branch is used by ds/maintenance-part-1, ds/maintenance-part-2 and jt/lazy-fetch.)
+
+ "git fetch" learned --no-write-fetch-head option to avoid writing
+ the FETCH_HEAD file.
+
+ Will merge to 'master'.
+
+
+* jt/lazy-fetch (2020-08-18) 7 commits
+ - fetch-pack: remove no_dependents code
+ - promisor-remote: lazy-fetch objects in subprocess
+ - fetch-pack: do not lazy-fetch during ref iteration
+ - fetch: only populate existing_refs if needed
+ - fetch: avoid reading submodule config until needed
+ - fetch: allow refspecs specified through stdin
+ - negotiator/noop: add noop fetch negotiator
+ (this branch uses jc/no-update-fetch-head; is tangled with ds/maintenance-part-1 and ds/maintenance-part-2.)
+
+ Updates to on-demand fetching code in lazily cloned repositories.
+
+
+* mt/checkout-entry-dead-code-removal (2020-08-18) 1 commit
+ (merged to 'next' on 2020-08-19 at 58866e5299)
+ + checkout_entry(): remove unreachable error() call
+
+ Code clean-up.
+
+ Will merge to 'master'.
+
+
* jx/proc-receive-hook (2020-08-17) 10 commits
- doc: add documentation for the proc-receive hook
- transport: parse report options for tracking refs
Needs review.
-* pw/rebase-i-more-options (2020-08-17) 5 commits
- - rebase: add --reset-author-date
- - rebase -i: support --ignore-date
- - rebase -i: support --committer-date-is-author-date
- - am: stop exporting GIT_COMMITTER_DATE
- - rebase -i: add --ignore-whitespace flag
+* pw/rebase-i-more-options (2020-08-19) 5 commits
+ (merged to 'next' on 2020-08-21 at ade71fd49b)
+ + rebase: add --reset-author-date
+ + rebase -i: support --ignore-date
+ + rebase -i: support --committer-date-is-author-date
+ + am: stop exporting GIT_COMMITTER_DATE
+ + rebase -i: add --ignore-whitespace flag
"git rebase -i" learns a bit more options.
- Waiting for a (hopefully final) review.
+ Will merge to 'master'.
* rs/more-buffered-io (2020-08-17) 3 commits
- - upload-pack: use buffered I/O to talk to rev-list
- - midx: use buffered I/O to talk to pack-objects
- - connected: use buffered I/O to talk to rev-list
+ (merged to 'next' on 2020-08-19 at 6d23a23bb2)
+ + upload-pack: use buffered I/O to talk to rev-list
+ + midx: use buffered I/O to talk to pack-objects
+ + connected: use buffered I/O to talk to rev-list
Use more buffered I/O where we used to call many small write(2)s.
- Will merge to 'next'.
-
-
-* en/merge-tests (2020-08-10) 11 commits
- (merged to 'next' on 2020-08-13 at eab952350b)
- + t6425: be more flexible with rename/delete conflict messages
- + t642[23]: be more flexible for add/add conflicts involving pair renames
- + t6422, t6426: be more flexible for add/add conflicts involving renames
- + t6423: add an explanation about why one of the tests does not pass
- + t6416, t6423: clarify some comments and fix some typos
- + t6422: fix multiple errors with the mod6 test expectations
- + t6423: fix test setup for a couple tests
- + t6416, t6422: fix incorrect untracked file count
- + t6422: fix bad check against missing file
- + t6418: tighten delete/normalize conflict testcase
- + Collect merge-related tests to t64xx
-
- Updates to "git merge" tests, in preparation for a new merge
- strategy backend.
-
Will merge to 'master'.
Will merge to 'master'.
-* rs/upload-pack-sigchain-fix (2020-08-11) 1 commit
- (merged to 'next' on 2020-08-17 at 997473f309)
- + upload-pack: remove superfluous sigchain_pop() call
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
* tb/bloom-improvements (2020-08-11) 14 commits
- builtin/commit-graph.c: introduce '--max-new-filters=<n>'
- commit-graph: rename 'split_commit_graph_opts'
cf. <20200811220503.GC66656@syl.lan>
-* ak/sequencer-fix-find-uniq-abbrev (2020-08-13) 1 commit
- (merged to 'next' on 2020-08-17 at 6ce0f1d111)
- + rebase -i: fix possibly wrong onto hash in todo
-
- Ring buffer with size 4 used for bin-hex translation resulted in a
- wrong object name in the sequencer's todo output, which has been
- corrected.
-
- Will merge to 'master'.
-
-
* en/dir-nonbare-embedded (2020-08-12) 2 commits
(merged to 'next' on 2020-08-17 at ab180b7fcb)
+ dir: avoid prematurely marking nonbare repositories as matches
Will merge to 'master'.
-* en/sequencer-merge-labels (2020-08-14) 1 commit
- (merged to 'next' on 2020-08-17 at 2010e329ed)
- + sequencer: avoid garbled merge machinery messages due to commit labels
-
- The commit labels used to explain each side of conflicted hunks
- placed by the sequencer machinery have been made more readable by
- humans.
-
- Will merge to 'master'.
-
-
-* jb/commit-graph-doc-fix (2020-08-13) 1 commit
- (merged to 'next' on 2020-08-17 at d83ee98955)
- + docs: commit-graph: fix some whitespace in the diagram
-
- Docfix.
-
- Will merge to 'master'.
-
-
-* jk/blame-coalesce-fix (2020-08-13) 3 commits
- (merged to 'next' on 2020-08-17 at 122c701ec7)
- + blame: only coalesce lines that are adjacent in result
- + t8003: factor setup out of coalesce test
- + t8003: check output of coalesced blame
-
- When given more than one target line ranges, "git blame -La,b
- -Lc,d" was over-eager to coalesce groups of original lines and
- showed incorrect results, which has been corrected.
-
- Will merge to 'master'.
-
-
* jk/slimmed-down (2020-08-13) 5 commits
- drop vcs-svn experiment
- make git-fast-import a builtin
Will merge to 'master'.
-* pb/set-url-docfix (2020-08-13) 1 commit
- (merged to 'next' on 2020-08-17 at 19b56c6ebb)
- + fetch, pull doc: correct description of '--set-upstream'
-
- Doc fix.
-
- Will merge to 'master'.
-
-
-* pb/userdiff-fortran-update (2020-08-13) 2 commits
- (merged to 'next' on 2020-08-17 at 534af3f35a)
- + userdiff: improve Fortran xfuncname regex
- + userdiff: add tests for Fortran xfuncname regex
-
- The regexp to identify the function boundary for FORTRAN programs
- has been updated.
-
- Will merge to 'master'.
-
-
-* rs/preserve-merges-unused-code-removal (2020-08-12) 1 commit
- (merged to 'next' on 2020-08-17 at b96393455c)
- + rebase: remove unused function reschedule_last_action
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
-* ss/t7401-modernize (2020-08-12) 4 commits
+* ss/t7401-modernize (2020-08-21) 5 commits
- t7401: add a NEEDSWORK
- t7401: change indentation for enhanced readability
- - t7401: change test_i18ncmp syntax for clarity
+ - t7401: change syntax of test_i18ncmp calls for clarity
+ - t7401: use 'short' instead of 'verify' and cut in rev-parse calls
- t7401: modernize style
Test clean-up.
- Expecting a reroll.
- cf. <c70f7bb5d1289f5318da7b99e41cf5828a451174.camel@gmail.com>
- Almost there, it seems.
+ Looking good.
* ds/maintenance-part-2 (2020-08-18) 8 commits
* ma/doc-sha-256-is-experimental (2020-08-17) 1 commit
- - Documentation: mark `--object-format=sha256` as experimental
+ (merged to 'next' on 2020-08-19 at 9ccf6c399c)
+ + Documentation: mark `--object-format=sha256` as experimental
The recent addition of SHA-256 support is marked as experimental in
the documentation.
- Will merge to 'next'.
+ Will merge to 'master'.
* ss/submodule-summary-in-c (2020-08-12) 4 commits
Will merge to 'master'.
-* am/ci-wsfix (2020-08-10) 1 commit
+* am/ci-wsfix (2020-08-21) 1 commit
- ci: fix inconsistent indentation
Aesthetic fix to a CI configuration file.
- Waiting for a reroll.
- It needs a better log message.
+ Will merge to 'next'.
* es/init-no-separate-git-dir-in-bare (2020-08-10) 1 commit
Will merge to 'master'.
-* rp/ita-diff-modefix (2020-08-09) 1 commit
- (merged to 'next' on 2020-08-17 at c03a9cfb6e)
- + diff-lib: use worktree mode in diffs from i-t-a entries
-
- "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
- bit was not showing the mode bits from the working tree.
-
- Will merge to 'master'.
-
-
* ds/maintenance-part-1 (2020-08-18) 11 commits
- maintenance: add trace2 regions for task execution
- maintenance: add auto condition for commit-graph task
projects / thirdparty / git.git / commitdiff
