What's cooking in git.git (Oct 2020, #04; Tue, 27)

What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Junio C Hamano]

Here are the topics that have been cooking.  Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'.  The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.

The first batch of topics in this cycle are merged to 'master', and
the tip of 'next' has been rewound and rebuilt.  A handful of new
topics are also in 'next'.

Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into.  Some repositories have
only a subset of branches.

With maint, master, next, seen, todo:

	git://git.kernel.org/pub/scm/git/git.git/
	git://repo.or.cz/alt-git.git/
	https://kernel.googlesource.com/pub/scm/git/git/
	https://github.com/git/git/

With all the integration branches and topics broken out:

	https://github.com/gitster/git/

Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):

	git://git.kernel.org/pub/scm/git/git-htmldocs.git/
	https://github.com/gitster/git-htmldocs.git/

Release tarballs are available at:

	https://www.kernel.org/pub/software/scm/git/

--------------------------------------------------
[Graduated to 'master']

* cc/doc-filter-branch-typofix (2020-10-20) 1 commit
  (merged to 'next' on 2020-10-23 at fc3c91dbc4)
 + filter-branch doc: fix filter-repo typo

 Docfix.


* cw/ci-ghwf-check-ws-errors (2020-10-09) 1 commit
  (merged to 'next' on 2020-10-26 at e7f8479a06)
 + ci: github action - add check for whitespace errors

 Originally merged to 'next' on 2020-10-15

 Dev support.


* dl/checkout-guess (2020-10-08) 2 commits
  (merged to 'next' on 2020-10-26 at ba63e6e268)
 + checkout: learn to respect checkout.guess
 + Documentation/config/checkout: replace sq with backticks

 Originally merged to 'next' on 2020-10-08

 "git checkout" learned to use checkout.guess configuration variable
 and enable/disable its "--[no-]guess" option accordingly.


* dl/checkout-p-merge-base (2020-10-07) 4 commits
  (merged to 'next' on 2020-10-26 at 1c401bcb0b)
 + t2016: add a NEEDSWORK about the PERL prerequisite
 + add-patch: add NEEDSWORK about comparing commits
 + Doc: document "A...B" form for <tree-ish> in checkout and switch
 + builtin/checkout: fix `git checkout -p HEAD...` bug

 Originally merged to 'next' on 2020-10-08

 "git checkout -p A...B [-- <path>]" did not work, even though the
 same command without "-p" correctly used the merge-base between
 commits A and B.


* ds/maintenance-part-2 (2020-09-25) 8 commits
  (merged to 'next' on 2020-10-26 at 226ac6646d)
 + maintenance: add incremental-repack auto condition
 + maintenance: auto-size incremental-repack batch
 + maintenance: add incremental-repack task
 + midx: use start_delayed_progress()
 + midx: enable core.multiPackIndex by default
 + maintenance: create auto condition for loose-objects
 + maintenance: add loose-objects task
 + maintenance: add prefetch task
 (this branch is used by ds/maintenance-part-3.)

 Originally merged to 'next' on 2020-10-04

 "git maintenance", an extended big brother of "git gc", continues
 to evolve.


* jk/committer-date-is-author-date-fix (2020-10-23) 3 commits
  (merged to 'next' on 2020-10-23 at ee490e95b8)
 + rebase: fix broken email with --committer-date-is-author-date
 + am: fix broken email with --committer-date-is-author-date
 + t3436: check --committer-date-is-author-date result more carefully
 (this branch is used by jk/committer-date-is-author-date-fix-simplify.)

 In 2.29, "--committer-date-is-author-date" option of "rebase" and
 "am" subcommands lost the e-mail address by mistake, which has been
 corrected.


* js/no-builtins-on-disk-option (2020-10-21) 1 commit
  (merged to 'next' on 2020-10-22 at 88cec4a607)
 + SKIP_DASHED_BUILT_INS: do not skip the bin/ programs

 Brown-paper-bag fix.


* js/userdiff-php (2020-10-07) 1 commit
  (merged to 'next' on 2020-10-26 at 21dc182f78)
 + userdiff: PHP: catch "abstract" and "final" functions

 Originally merged to 'next' on 2020-10-08

 Userdiff for PHP update.


* kb/userdiff-rust-macro-rules (2020-10-07) 1 commit
  (merged to 'next' on 2020-10-26 at 681f75320c)
 + userdiff: recognize 'macro_rules!' as starting a Rust function block

 Originally merged to 'next' on 2020-10-08

 Userdiff for Rust update.


* rk/completion-stash (2020-10-07) 2 commits
  (merged to 'next' on 2020-10-26 at d694e89155)
 + git-completion.bash: stash-show: complete $__git_diff_common_options
 + git-completion.bash: __git_diff_common_options: add --[no-]patch

 Originally merged to 'next' on 2020-10-08

 The command line completion script (in contrib/) learned that "git
 stash show" takes the options "git diff" takes.


* rs/dist-doc-with-git-archive (2020-10-12) 2 commits
  (merged to 'next' on 2020-10-26 at 1391e1ae82)
 + Makefile: remove the unused variable TAR_DIST_EXTRA_OPTS
 + Makefile: use git init/add/commit/archive for dist-doc

 Originally merged to 'next' on 2020-10-15

 Use "git archive" more to produce the release tarball.


* rs/tighten-callers-of-deref-tag (2020-10-12) 3 commits
  (merged to 'next' on 2020-10-26 at b33d5986e5)
 + line-log: handle deref_tag() returning NULL
 + blame: handle deref_tag() returning NULL
 + grep: handle deref_tag() returning NULL

 Originally merged to 'next' on 2020-10-15

 Code clean-up.


* rs/worktree-list-show-locked (2020-10-12) 1 commit
  (merged to 'next' on 2020-10-26 at 398e14f216)
 + worktree: teach `list` to annotate locked worktree

 Originally merged to 'next' on 2020-10-15

 "git worktree list" now shows if each worktree is locked.  This
 possibly may open us to show other kinds of states in the future.


* sb/clone-origin (2020-09-30) 7 commits
  (merged to 'next' on 2020-10-26 at 83fbb58da1)
 + clone: allow configurable default for `-o`/`--origin`
 + clone: read new remote name from remote_name instead of option_origin
 + clone: validate --origin option before use
 + refs: consolidate remote name validation
 + remote: add tests for add and rename with invalid names
 + clone: use more conventional config/option layering
 + clone: add tests for --template and some disallowed option pairs

 Originally merged to 'next' on 2020-10-06

 "git clone" learned clone.defaultremotename configuration variable
 to customize what nickname to use to call the remote the repository
 was cloned from.


* sd/userdiff-css-update (2020-10-08) 1 commit
  (merged to 'next' on 2020-10-26 at 253e1d021b)
 + userdiff: expand detected chunk headers for css

 Originally merged to 'next' on 2020-10-08

 Userdiff for CSS update.


* sk/force-if-includes (2020-10-03) 4 commits
  (merged to 'next' on 2020-10-26 at 648422f517)
 + t, doc: update tests, reference for "--force-if-includes"
 + push: parse and set flag for "--force-if-includes"
 + push: add reflog check for "--force-if-includes"
 + Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes

 Originally merged to 'next' on 2020-10-04

 "git push --force-with-lease[=<ref>]" can easily be misused to lose
 commits unless the user takes good care of their own "git fetch".
 A new option "--force-if-includes" attempts to ensure that what is
 being force-pushed was created after examining the commit at the
 tip of the remote ref that is about to be force-replaced.

--------------------------------------------------
[New Topics]

* cm/t7xxx-cleanup (2020-10-22) 6 commits
  (merged to 'next' on 2020-10-26 at 8b58e54942)
 + t7102: prepare expected output inside test_expect_* block
 + t7201: put each command on a separate line
 + t7201: use 'git -C' to avoid subshell
 + t7102,t7201: remove whitespace after redirect operator
 + t7102,t7201: remove unnecessary blank spaces in test body
 + t7101,t7102,t7201: modernize test formatting

 Originally merged to 'next' on 2020-10-23

 Micro clean-up.

 Will merge to 'master'.


* js/avoid-split-sideband-message (2020-10-27) 3 commits
  (merged to 'next' on 2020-10-27 at 06b2f75522)
 + test-pkt-line: drop colon from sideband identity
  (merged to 'next' on 2020-10-26 at 1b550f3245)
 + sideband: report unhandled incomplete sideband messages as bugs
 + sideband: avoid reporting incomplete sideband messages

 The side-band status report can be sent at the same time as the
 primary payload multiplexed, but the demultiplexer on the receiving
 end incorrectly split a single status report into two, which has
 been corrected.

 Will merge to 'master'.


* jt/apply-reverse-twice (2020-10-20) 1 commit
  (merged to 'next' on 2020-10-26 at f060893eb7)
 + apply: when -R, also reverse list of sections

 "git apply -R" did not handle patches that touch the same path
 twice correctly, which has been corrected.  This is most relevant
 in a patch that changes a path from a regular file to a symbolic
 link (and vice versa).

 Will merge to 'master'.


* av/fsmonitor-cleanup (2020-10-21) 2 commits
 - fsmonitor: make output of test-dump-fsmonitor more concise
 - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid

 Code clean-up.

 Unneeded?
 cf. <20201022183822.GA781760@nand.local>


* bc/svn-hash-oid-fix (2020-10-21) 1 commit
  (merged to 'next' on 2020-10-26 at 743b549d5d)
 + svn: use correct variable name for short OID

 A recent oid->hash conversion missed one spot, breaking "git svn".

 Will merge to 'master'.


* en/sequencer-rollback-lock-cleanup (2020-10-21) 1 commit
  (merged to 'next' on 2020-10-26 at 1234e8297f)
 + sequencer: remove duplicate rollback_lock_file() call

 Code clean-up.

 Will merge to 'master'.


* jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
 - sequencer: tolerate abbreviated stopped-sha file

 Recently the format of an internal state file "rebase -i" uses has
 been tightened up for consistency, which would hurt those who start
 "rebase -i" with old git and then continue with new git.  Loosen
 the reader side a bit (which we may want to tighten again in a year
 or so).

 Is this a real issue, or just a theoretical one?
 cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>


* jk/perl-warning (2020-10-21) 1 commit
 - perl: check for perl warnings while running tests

 Dev support.

 Will merge to 'next'.
 cf. <20201022032400.GC1480820@coredump.intra.peff.net>


* js/default-branch-name-part-4-minus-1 (2020-10-23) 9 commits
  (merged to 'next' on 2020-10-26 at 0a66b76c66)
 + t1400: prepare for `main` being default branch name
 + tests: prepare aligned mentions of the default branch name
 + t9902: prepare a test for the upcoming default branch name
 + t3200: prepare for `main` being shorter than `master`
 + t5703: adjust a test case for the upcoming default branch name
 + t6200: adjust suppression pattern to also match "main"
 + tests: start moving to a different default main branch name
 + t9801: use `--` in preparation for default branch rename
 + fmt-merge-msg: also suppress "into main" by default

 Adjust tests so that they won't scream when the default initial
 branch name is changed to 'main'.

 Will merge to 'master'.


* js/t7006-cleanup (2020-10-21) 1 commit
  (merged to 'next' on 2020-10-26 at b8582f842d)
 + t7006: Use test_path_is_* functions in test script

 Code clean-up.

 Will merge to 'master'.


* pb/ref-filter-with-crlf (2020-10-22) 2 commits
 - log, show: add tests for messages containing CRLF
 - ref-filter: handle CRLF at end-of-line more gracefully

 A commit and tag object may have CR at the end of each and
 every line (you can create such an object with hash-object or
 using --cleanup=verbatim to decline the default clean-up
 action), but it would make it impossible to have a blank line
 to separate the title from the body of the message.  Be lenient
 and accept a line with lone CR on it as a blank line, too.

 Will merge to 'next'.


* ve/userdiff-bash (2020-10-22) 1 commit
  (merged to 'next' on 2020-10-26 at 2b34be98fe)
 + userdiff: support Bash

 The userdiff pattern learned to identify the function definition in
 POSIX shells and bash.

 Will merge to 'master'.


* ab/git-remote-exit-code (2020-10-27) 1 commit
 - remote: add meaningful exit code on missing/existing

 Exit codes from "git remote add" etc. were not usable by scripted
 callers.


* en/merge-ort-api-null-impl (2020-10-26) 4 commits
 - merge,rebase,revert: select ort or recursive by config or environment
 - fast-rebase: demonstrate merge-ort's API via temporary/hidden command
 - merge-ort-wrappers: new convience wrappers to mimic the old merge API
 - merge-ort: barebones API of new merge strategy with empty implementation

 Preparation for a new merge strategy.


* en/merge-tests (2020-10-26) 9 commits
 - t6423: add more details about direct resolution of directories
 - t6423: note improved ort handling with untracked files
 - t6423, t6436: note improved ort handling with dirty files
 - merge tests: expect slight differences in output for recursive vs. ort
 - t6423: expect improved conflict markers labels in the ort backend
 - t6404, t6423: expect improved rename/delete handling in ort backend
 - t6416: correct expectation for rename/rename(1to2) + directory/file
 - merge tests: expect improved directory/file conflict handling in ort
 - t/: new helper for tests that pass with ort but fail with recursive
 (this branch uses en/dir-rename-tests.)

 Preparation for a new merge strategy.


* jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
 - am, sequencer: stop parsing our own committer ident

 Code symplification.


* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
 - diff: do not show submodule with untracked files as "-dirty"

 "git diff" showed a submodule working tree with untracked cruft as
 "Submodule commit <objectname>-dirty", but a natural expectation is
 that the "-dirty" indicator would align with "git describe --dirty",
 which does not consider having untracked files in the working tree
 as source of dirtiness.  The inconsistency has been fixed.

 Needs doc update.


* fc/zsh-completion (2020-10-26) 29 commits
 - zsh: update copyright notices
 - completion: bash: remove old compat wrappers
 - completion: bash: cleanup cygwin check
 - completion: bash: trivial cleanup
 - completion: zsh: add simple version check
 - completion: zsh: trivial simplification
 - completion: zsh: add alias descriptions
 - completion: zsh: improve command tags
 - completion: zsh: refactor command completion
 - completion: zsh: shuffle functions around
 - completion: zsh: simplify file_direct
 - completion: zsh: simplify nl_append
 - completion: zsh: trivial cleanup
 - completion: zsh: simplify direct compadd
 - completion: zsh: simplify compadd functions
 - completion: zsh: fix splitting of words
 - completion: zsh: add missing direct_append
 - completion: fix conflict with bashcomp
 - completion: zsh: fix completion for --no-.. options
 - completion: bash: remove zsh wrapper
 - completion: bash: synchronize zsh wrapper
 - completion: zsh: fix for command aliasing
 - completion: prompt: fix color for Zsh
 - completion: zsh: update slave script locations
 - completion: zsh: fix for directories with spaces
 - completion: zsh: reorganize install instructions
 - completion: zsh: fix bash script extension
 - completion: zsh: fix name due to broken autoloading
 - completion: zsh: fix __gitcomp_direct()


* jc/doc-final-resend (2020-10-26) 1 commit
 - SubmittingPatches: clarify the purpose of the final resend


* nk/perf-fsmonitor (2020-10-26) 10 commits
 - t/perf/fsmonitor: add benchmark for dirty status
 - t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations
 - t/perf/fsmonitor: initialize test with git reset
 - t/perf/fsmonitor: factor setup for fsmonitor into function
 - t/perf/fsmonitor: silence initial git commit
 - t/perf/fsmonitor: shorten DESC to basename
 - t/perf/fsmonitor: factor description out for readability
 - t/perf/fsmonitor: improve error message if typoing hook name
 - t/perf/fsmonitor: move watchman setup to one-time-repo-setup
 - t/perf/fsmonitor: separate one time repo initialization
 (this branch uses nk/diff-files-vs-fsmonitor.)


* jk/checkout-index-errors (2020-10-27) 2 commits
 - checkout-index: propagate errors to exit code
 - checkout-index: drop error message from empty --stage=all


* pw/rebase-i-orig-head (2020-10-27) 4 commits
 - rebase -i: simplify get_revision_ranges()
 - rebase -i: use struct object_id when writing state
 - rebase -i: use struct object_id rather than looking up commit
 - rebase -i: stop overwriting ORIG_HEAD buffer

--------------------------------------------------
[Stalled]

* hn/reftable (2020-10-01) 13 commits
 . reftable: "test-tool dump-reftable" command.
 . reftable: rest of library
 . reftable: file level tests
 . reftable: read reftable files
 . reftable: write reftable files
 . reftable: a generic binary tree implementation
 . reftable: reading/writing blocks
 . reftable: (de)serialization for the polymorphic record type.
 . reftable: utility functions
 . reftable: add a barebones unittest framework
 . vcxproj: adjust for the reftable changes
 . reftable: define the public API
 . reftable: add LICENSE

 The reftable backend for the refs API.

 Expecting a reroll.
 Seems not to build for Windows folks.
 cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
 cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>


* sm/curl-retry (2020-10-13) 3 commits
 - http: automatically retry some requests
 - replace CURLOPT_FILE With CURLOPT_WRITEDATA
 - remote-curl: add testing for intelligent retry for HTTP

 The http transport has been taught to retry a failed request that
 may reasonably be retried.

 cf. <20201015000410.GB328643@google.com>


* sv/t7001-modernize (2020-09-25) 11 commits
 - t7001: move cleanup code from outside the tests into them
 - t7001: use `test` rather than `[`
 - t7001: use here-docs instead of echo
 - t7001: put each command on a separate line
 - t7001: use ': >' rather than 'touch'
 - t7001: change (cd <path> && git foo) to (git -C <path> foo)
 - t7001: remove whitespace after redirect operators
 - t7001: change the style for cd according to subshell
 - t7001: remove unnecessary blank lines
 - t7001: use TAB instead of spaces
 - t7001: convert tests from the old style to the current style

 Test script modernization.

 Expecting a reroll.
 cf. <20200925170256.11490-1-shubhunic@gmail.com>


* ew/decline-core-abbrev (2020-09-01) 1 commit
 - core.abbrev <off|false|no> disables abbreviations

 Allow the configuration to specify no abbreviation regardless of
 the hash algorithm.

 Expecting a reroll.  The intent is very good.


* bc/rev-parse-path-format (2020-10-09) 2 commits
 - rev-parse: add option for absolute or relative path formatting
 - abspath: add a function to resolve paths with missing components

 "git rev-parse" can be explicitly told to give output as absolute
 or relative path.


* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
 - config: option transfer.ipversion to set transport protocol version for network fetches

 Adds transfer.ipversion configuration variable.

 Needs more work.


* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
 - Documentation/git-send-email.txt: Mention less secure app access might need to enable.

 Doc update.

 Expecting a reroll.
 cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
 cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>


* jc/war-on-dashed-git (2020-08-27) 1 commit
 - git: catch an attempt to run "git-foo"

 The first step to remove on-disk binaries for built-in subcommands
 by soliciting objections.

 On hold for now.


* dr/push-remoteref-fix (2020-04-23) 1 commit
 - remote.c: fix handling of %(push:remoteref)

 The "%(push:remoteref)" placeholder in the "--format=" argument of
 "git format-patch" (and friends) only showed what got explicitly
 configured, not what ref at the receiving end would be updated when
 "git push" was used, as it ignored the default behaviour (e.g. update
 the same ref as the source).

 Discard for now.
 cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
 cf. <20200911214358.acl3hy2e763begoo@feanor>


* mk/use-size-t-in-zlib (2018-10-15) 1 commit
 - zlib.c: use size_t for size

 The wrapper to call into zlib followed our long tradition to use
 "unsigned long" for sizes of regions in memory, which have been
 updated to use "size_t".

--------------------------------------------------
[Cooking]

* en/strmap (2020-10-13) 10 commits
 - strmap: enable allocations to come from a mem_pool
 - strmap: add a strset sub-type
 - strmap: add functions facilitating use as a string->int map
 - strmap: enable faster clearing and reusing of strmaps
 - strmap: add more utility functions
 - strmap: new utility functions
 - hashmap: introduce a new hashmap_partial_clear()
 - hashmap: allow re-use after hashmap_free()
 - hashmap: adjust spacing to fix argument alignment
 - hashmap: add usage documentation explaining hashmap_free[_entries]()

 A speciailization of hashmap that uses a string as key has been
 introduced.  Hopefully it will see wider use over time.

 On hold.
 cf. <20201023080202.GA4012156@coredump.intra.peff.net>
 cf. <CABPp-BFV8ZAu5vLarG2mX8gT5bfV31oqbd-vjAQF_YDcyNSRiw@mail.gmail.com>


* en/test-selector (2020-10-18) 3 commits
  (merged to 'next' on 2020-10-26 at 3d6e77c3ff)
 + test-lib: reduce verbosity of skipped tests
 + t6006, t6012: adjust tests to use 'setup' instead of synonyms
 + test-lib: allow selecting tests by substring/glob with --run

 Our test scripts can be told to run only individual pieces while
 skipping others with the "--run=..." option; they were taught to
 take a substring of test title, in addition to numbers, to name the
 test pices to run.

 Will merge to 'master'.


* jk/report-fn-typedef (2020-10-16) 1 commit
  (merged to 'next' on 2020-10-26 at fa4e128b65)
 + usage: define a type for a reporting function

 Code clean-up.

 Will merge to 'master'.


* mr/bisect-in-c-3 (2020-10-16) 7 commits
 - bisect--helper: retire `--bisect-autostart` subcommand
 - bisect--helper: retire `--write-terms` subcommand
 - bisect--helper: retire `--check-expected-revs` subcommand
 - bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
 - bisect--helper: retire `--next-all` subcommand
 - bisect--helper: retire `--bisect-clean-state` subcommand
 - bisect--helper: finish porting `bisect_start()` to C

 Rewriting "git bisect" in C continues.

 Will merge to 'next'.


* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
  (merged to 'next' on 2020-10-26 at e1c956e52a)
 + t3435: add tests for rebase -r GPG signing
 + sequencer: pass explicit --no-gpg-sign to merge
 + sequencer: fix gpg option passed to merge subcommand

 "git rebase --rebase-merges" did not correctly pass --gpg-sign
 command line option to underying "git merge" when replaying a merge
 using non-default merge strategy or when replaying an octopus merge
 (because replaying a two-head merge with the default strategy was
 done in a separate codepath, the problem did not trigger for most
 users), which has been corrected.

 Will merge to 'master'.


* as/sample-push-to-checkout-hook (2020-10-16) 1 commit
  (merged to 'next' on 2020-10-26 at 644026c2f6)
 + hook: add sample template for push-to-checkout

 Add a sample 'push-to-checkout' hook, that performs the same as
 what the built-in default action does.

 Will merge to 'master'.


* as/tests-cleanup (2020-10-18) 1 commit
 - t2200,t9832: avoid using 'git' upstream in a pipe

 Micro clean-up of a couple of test scripts.

 Will merge to 'next'.


* bk/sob-dco (2020-10-20) 4 commits
  (merged to 'next' on 2020-10-26 at d0e5066a7e)
 + Documentation: stylistically normalize references to Signed-off-by:
 + SubmittingPatches: clarify DCO is our --signoff rule
 + Documentation: clarify and expand description of --signoff
 + doc: preparatory clean-up of description on the sign-off option

 Document that the meaning of a Signed-off-by trailer can vary from
 project to project in the end-user documentation, and clarify what
 it means to this project.

 Will merge to 'master'.


* ct/t0000-use-test-path-is-file (2020-10-18) 1 commit
  (merged to 'next' on 2020-10-26 at 9b70aa748f)
 + t0000: use test_path_is_file instead of "test -f"

 Originally merged to 'next' on 2020-10-23

 Micro clean-up of a test script.

 Will merge to 'master'.


* en/dir-rename-tests (2020-10-16) 4 commits
 - t6423: more involved rules for renaming directories into each other
 - t6423: update directory rename detection tests with new rule
 - t6423: more involved directory rename test
 - directory-rename-detection.txt: update references to regression tests
 (this branch is used by en/merge-tests.)

 More preliminary tests have been added to document desired outcome
 of various "directory rename" situations.

 Will merge to 'next'.


* en/t7518-unflake (2020-10-18) 1 commit
  (merged to 'next' on 2020-10-26 at 443459f7ca)
 + t7518: fix flaky grep invocation

 Originally merged to 'next' on 2020-10-23

 Work around flakiness in a test.

 Will merge to 'master'.


* es/test-cmp-typocatcher (2020-10-20) 1 commit
  (merged to 'next' on 2020-10-26 at 62d89db753)
 + Revert "test_cmp: diagnose incorrect arguments"

 A test helper "test_cmp A B" was taught to diagnose missing files A
 or B as a bug in test, but some tests legitimately wanted to notice
 a failure to even create file B as an error, in addition to leaving
 the expected result in it, and were misdiagnosed as a bug.  This
 has been corrected.

 Will merge to 'master'.


* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
 - MyFirstContribution: clarify asciidoc dependency

 Doc update.

 Will merge to 'next'.


* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
  (merged to 'next' on 2020-10-26 at 2f0a73fd48)
 + fast-import: fix over-allocation of marks storage

 "git fast-import" wasted a lot of memory when many marks were in use.

 Will merge to 'master'.


* jk/fast-import-marks-cleanup (2020-10-16) 1 commit
  (merged to 'next' on 2020-10-26 at 1ba987dd54)
 + fast-import: remove duplicated option-parsing line

 Code clean-up.

 Will merge to 'master'.


* jk/no-common (2020-10-16) 1 commit
  (merged to 'next' on 2020-10-26 at c888cb8b28)
 + config.mak.dev: build with -fno-common

 Dev support to catch a tentative definition of a variable in our C
 code as an error.

 Will merge to 'master'.


* js/ci-ghwf-dedup-tests (2020-10-12) 2 commits
  (merged to 'next' on 2020-10-26 at 4832a8f40b)
 + ci: make the "skip-if-redundant" check more defensive
 + ci: work around old records of GitHub runs

 Originally merged to 'next' on 2020-10-23

 GitHub Actions automated test improvement to skip tests on a tree
 identical to what has already been tested.

 Will merge to 'master'.


* lo/zsh-completion (2020-10-16) 1 commit
  (merged to 'next' on 2020-10-26 at 100dc6adde)
 + completion: fix zsh installation instructions

 Update instructions for command line completion (in contrib/) for zsh.

 Will merge to 'master'.


* nk/diff-files-vs-fsmonitor (2020-10-20) 7 commits
 - p7519-fsmonitor: add a git add benchmark
 - p7519-fsmonitor: refactor to avoid code duplication
 - perf lint: add make test-lint to perf tests
 - t/perf: add fsmonitor perf test for git diff
 - t/perf/p7519-fsmonitor.sh: warm cache on first git status
 - t/perf/README: elaborate on output format
 - fsmonitor: use fsmonitor data in `git diff`
 (this branch is used by nk/perf-fsmonitor.)

 "git diff" and other commands that share the same machinery to
 compare with working tree files have been taught to take advantage
 of the fsmonitor data when available.

 Will merge to 'next'.


* nk/dir-c-comment-update (2020-10-16) 1 commit
  (merged to 'next' on 2020-10-26 at 3a4cb82ad6)
 + dir.c: fix comments to agree with argument name

 Update stale in-code comment.

 Will merge to 'master'.


* tk/credential-config (2020-10-16) 1 commit
  (merged to 'next' on 2020-10-26 at 6ab486f389)
 + credential: load default config

 "git credential' didn't honor the core.askPass configuration
 variable (among other things), which has been corrected.

 Will merge to 'master'.


* ag/merge-strategies-in-c (2020-10-06) 11 commits
 - sequencer: use the "octopus" merge 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-index: don't fork if the requested program is `git-merge-one-file'
 - merge-index: libify merge_one_path() and merge_all()
 - merge-one-file: rewrite in C
 - t6027: modernise tests

 The resolve and octopus merge strategy backends have been rewritten
 in C.


* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
  (merged to 'next' on 2020-10-26 at c1dd37b024)
 + docs: document symlink restrictions for .git* files
 + fsck: complain when .gitattributes or .gitignore is a symlink
 + verify_path(): disallow symlinks in .gitattributes and .gitignore
 + t0060: test obscured .gitattributes and .gitignore matching
 + t7450: test .gitmodules symlink matching against obscured names
 + t7450: test verify_path() handling of gitmodules
 + t7415: rename to expand scope
 + fsck_tree(): wrap some long lines
 + fsck_tree(): fix shadowed variable

 Originally merged to 'next' on 2020-10-23

 "git fsck" and the corresponding check done during the transport
 learned to ensure that in-tree files like `.gitignore` and
 `.gitattributes` are not symbolic links.

 Will merge to 'master'.


* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
  (merged to 'next' on 2020-10-26 at 7e94297aa4)
 + contrib/git-resurrect.sh: use hash-agnostic OID pattern
 + contrib/git-resurrect.sh: indent with tabs

 Originally merged to 'next' on 2020-10-23

 "git resurrect" script (in contrib/) learned that the object names
 may be longer than 40-hex depending on the hash function in use.

 Will merge to 'master'.


* ds/commit-graph-merging-fix (2020-10-09) 2 commits
  (merged to 'next' on 2020-10-26 at a0cf763826)
 + commit-graph: don't write commit-graph when disabled
 + commit-graph: ignore duplicates when merging layers

 When "git commit-graph" detects the same commit recorded more than
 once while it is merging the layers, it used to die.  The code now
 ignores all but one of them and continues.

 Will merge to 'master'.


* ds/maintenance-commit-graph-auto-fix (2020-10-12) 2 commits
  (merged to 'next' on 2020-10-26 at 429d1371d8)
 + maintenance: core.commitGraph=false prevents writes
 + maintenance: test commit-graph auto condition

 Test-coverage enhancement of running commit-graph task "git
 maintenance" as needed led to discovery and fix of a bug.

 Will merge to 'master'.


* ss/submodule-add-in-c (2020-10-07) 3 commits
 - t7400: add test to check 'submodule add' for tracked paths
 - submodule: port submodule subcommand 'add' from shell to C
 - dir: change the scope of function 'directory_exists_in_index()'

 "git submodule add" being rewritten in C.


* ak/corrected-commit-date (2020-10-08) 10 commits
 - doc: add corrected commit date info
 - commit-reach: use corrected commit dates in paint_down_to_common()
 - commit-graph: use generation v2 only if entire chain does
 - commit-graph: implement generation data chunk
 - commit-graph: implement corrected commit date
 - commit-graph: add a slab to store topological levels
 - commit-graph: return 64-bit generation number
 - commit-graph: consolidate fill_commit_graph_info
 - revision: parse parent in indegree_walk_step()
 - commit-graph: fix regression when computing Bloom filters

 The commit-graph learned to use corrected commit dates instead of
 the generation number to help topological revision traversal.

 Almost there.
 cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>


* mk/diff-ignore-regex (2020-10-20) 2 commits
  (merged to 'next' on 2020-10-26 at c68727da93)
 + diff: add -I<regex> that ignores matching changes
 + merge-base, xdiff: zero out xpparam_t structures

 "git diff" family of commands learned the "-I<regex>" option to
 ignore hunks whose changed lines all match the given pattern.

 Will merge to 'master'.


* mt/parallel-checkout-part-1 (2020-10-22) 20 commits
 - parallel-checkout: drop unused checkout state parameter
 - ci: run test round with parallel-checkout enabled
 - parallel-checkout: add tests related to .gitattributes
 - parallel-checkout: add tests related to clone collisions
 - parallel-checkout: add tests for basic operations
 - checkout-index: add parallel checkout support
 - builtin/checkout.c: complete parallel checkout support
 - make_transient_cache_entry(): optionally alloc from mem_pool
 - parallel-checkout: support progress displaying
 - parallel-checkout: make it truly parallel
 - unpack-trees: add basic support for parallel checkout
 - entry: add checkout_entry_ca() which takes preloaded conv_attrs
 - entry: move conv_attrs lookup up to checkout_entry()
 - entry: extract cache_entry update from write_entry()
 - entry: make fstat_output() and read_blob_entry() public
 - entry: extract a header file for entry.c functions
 - convert: add conv_attrs classification
 - convert: add get_stream_filter_ca() variant
 - convert: add [async_]convert_to_working_tree_ca() variants
 - convert: make convert_attrs() and convert structs public

 Parallel checkout.

 Ejected from 'next'
 cf. <CAHd-oW568aNLYYMBDPJiUsWzh2xxtm8gnqLEiX_RTDa81BL_yw@mail.gmail.com>


* dl/diff-merge-base (2020-09-21) 10 commits
  (merged to 'next' on 2020-10-26 at 114d94030b)
 + contrib/completion: complete `git diff --merge-base`
 + builtin/diff-tree: learn --merge-base
 + builtin/diff-index: learn --merge-base
 + t4068: add --merge-base tests
 + diff-lib: define diff_get_merge_base()
 + diff-lib: accept option flags in run_diff_index()
 + contrib/completion: extract common diff/difftool options
 + git-diff.txt: backtick quote command text
 + git-diff-index.txt: make --cached description a proper sentence
 + t4068: remove unnecessary >tmp

 "git diff A...B" learned "git diff --merge-base A B", which is a
 longer short-hand to say the same thing.

 Will merge to 'master'.


* ds/maintenance-part-3 (2020-10-16) 8 commits
 - maintenance: add troubleshooting guide to docs
 - maintenance: use 'incremental' strategy by default
 - maintenance: create maintenance.strategy config
 - maintenance: add start/stop subcommands
 - maintenance: add [un]register subcommands
 - for-each-repo: run subcommands on configured repos
 - maintenance: add --schedule option and config
 - maintenance: optionally skip --auto process

 Parts of "git maintenance" to ease writing crontab entries (and
 other scheduling system configuration) for it.


* es/config-hooks (2020-10-16) 8 commits
 - hook: replace find_hook() with hook_exists()
 - hook: add 'run' subcommand
 - parse-options: parse into strvec
 - hook: implement hookcmd.<name>.skip
 - hook: include hookdir hook in list
 - hook: add list command
 - hook: scaffolding for git-hook subcommand
 - doc: propose hooks managed by the config

 The "hooks defined in config" topic.


* mt/grep-sparse-checkout (2020-09-10) 9 commits
 - config: add setting to ignore sparsity patterns in some cmds
 - grep: honor sparse checkout patterns
 - config: correctly read worktree configs in submodules
 - config: make do_git_config_sequence receive a 'struct repository'
 - t/helper/test-config: unify exit labels
 - t/helper/test-config: diagnose missing arguments
 - t/helper/test-config: be consistent with exit codes
 - t1308-config-set: avoid false positives when using test-config
 - doc: grep: unify info on configuration variables

 "git grep" has been tweaked to be limited to the sparse checkout
 paths.

jc/sequencer-stopped-sha-simplify, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Johannes Schindelin]

Hi Junio,

On Tue, 27 Oct 2020, Junio C Hamano wrote:

> * jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
>  - sequencer: tolerate abbreviated stopped-sha file
>
>  Recently the format of an internal state file "rebase -i" uses has
>  been tightened up for consistency, which would hurt those who start
>  "rebase -i" with old git and then continue with new git.  Loosen
>  the reader side a bit (which we may want to tighten again in a year
>  or so).
>
>  Is this a real issue, or just a theoretical one?
>  cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>

We had a similar situation when we decided to fix the incorrect quoting in
the `author-script` file, and we decided that we have to be careful:
https://lore.kernel.org/git/nycvar.QRO.7.76.6.1807271415410.10478@tvgsbejvaqbjf.bet/

In light of that, I think we should go with Jonathan's patch for a couple
of versions before tightening the reader side again.

Ciao,
Dscho

jk/committer-date-is-author-date-fix-simplify, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Johannes Schindelin]

Hi Junio,

On Tue, 27 Oct 2020, Junio C Hamano wrote:

> * jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
>  - am, sequencer: stop parsing our own committer ident
>
>  Code symplification.

s/y/i/ ;-)

Ciao,
Dscho

sj/untracked-files-in-submodule-directory-is-not-dirty, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Johannes Schindelin]

Hi Junio,

On Tue, 27 Oct 2020, Junio C Hamano wrote:

> * sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
>  - diff: do not show submodule with untracked files as "-dirty"
>
>  "git diff" showed a submodule working tree with untracked cruft as
>  "Submodule commit <objectname>-dirty", but a natural expectation is
>  that the "-dirty" indicator would align with "git describe --dirty",
>  which does not consider having untracked files in the working tree
>  as source of dirtiness.  The inconsistency has been fixed.
>
>  Needs doc update.

I *think* the original rationale for marking submodules with untracked
(_un-ignored_) files was to avoid deleting a submodule that has
uncommitted (because untracked) files.

This is just a fall-out of the submodule design where it pretends that
submodules are files, but files only have a handful "aggregate states":
they are either ignored, untracked, up to date or dirty. Whereas submodule
can be all of the above, pretty much at the same time.

This patch affects e.g. if some script wants to determine whether a
submodule can be deleted safely and uses `git diff` to do so. With this
patch, it is possible to lose data irretrievably.

Ciao,
Dscho

ag/merge-strategies-in-c, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Johannes Schindelin]

[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]

Hi Junio,

On Tue, 27 Oct 2020, Junio C Hamano wrote:

> * ag/merge-strategies-in-c (2020-10-06) 11 commits
>  - sequencer: use the "octopus" merge 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-index: don't fork if the requested program is `git-merge-one-file'
>  - merge-index: libify merge_one_path() and merge_all()
>  - merge-one-file: rewrite in C
>  - t6027: modernise tests
>
>  The resolve and octopus merge strategy backends have been rewritten
>  in C.

From where I sit, this is ready for `next`.

Ciao,
Dscho

P.S.: I recently mused about the `pu -> seen` rename, and how the rest of
the integration branches' names could be renamed, too. It did strike me as
somewhat unfortunate that `master` is not called `next`, because it
essentially hosts the changes lined up for the next version. And what is
currently `next` could become `cooking` instead. Or `kitchen`. Or
`cauldron`. And in my musing's universe, there would not be any `maint`
branch, only `maint-<version>` branches à la `maint-2.29`...

Re: jc/sequencer-stopped-sha-simplify, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Tue, 27 Oct 2020, Junio C Hamano wrote:
>
>> * jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
>>  - sequencer: tolerate abbreviated stopped-sha file
>>
>>  Recently the format of an internal state file "rebase -i" uses has
>>  been tightened up for consistency, which would hurt those who start
>>  "rebase -i" with old git and then continue with new git.  Loosen
>>  the reader side a bit (which we may want to tighten again in a year
>>  or so).
>>
>>  Is this a real issue, or just a theoretical one?
>>  cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>
>
> We had a similar situation when we decided to fix the incorrect quoting in
> the `author-script` file, and we decided that we have to be careful:
> https://lore.kernel.org/git/nycvar.QRO.7.76.6.1807271415410.10478@tvgsbejvaqbjf.bet/
>
> In light of that, I think we should go with Jonathan's patch for a couple
> of versions before tightening the reader side again.

I do not mind taking the approach as a prudent and careful thing,
but I want the question answered regardless, as I know Jonathan is
in a good position to tell if this is just a theoretical issue than
I am, and depending on the answer, we may rethink the approach of
trying to be overly careful.

Thanks.

Re: jc/sequencer-stopped-sha-simplify, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Jonathan Tan]

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > Hi Junio,
> >
> > On Tue, 27 Oct 2020, Junio C Hamano wrote:
> >
> >> * jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
> >>  - sequencer: tolerate abbreviated stopped-sha file
> >>
> >>  Recently the format of an internal state file "rebase -i" uses has
> >>  been tightened up for consistency, which would hurt those who start
> >>  "rebase -i" with old git and then continue with new git.  Loosen
> >>  the reader side a bit (which we may want to tighten again in a year
> >>  or so).
> >>
> >>  Is this a real issue, or just a theoretical one?
> >>  cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>
> >
> > We had a similar situation when we decided to fix the incorrect quoting in
> > the `author-script` file, and we decided that we have to be careful:
> > https://lore.kernel.org/git/nycvar.QRO.7.76.6.1807271415410.10478@tvgsbejvaqbjf.bet/
> >
> > In light of that, I think we should go with Jonathan's patch for a couple
> > of versions before tightening the reader side again.
> 
> I do not mind taking the approach as a prudent and careful thing,
> but I want the question answered regardless, as I know Jonathan is
> in a good position to tell if this is just a theoretical issue than
> I am, and depending on the answer, we may rethink the approach of
> trying to be overly careful.

From what I see, this is just a theoretical issue for now. (I spotted it
while looking at the code, not because of a bug report.)

Re: jc/sequencer-stopped-sha-simplify, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Junio C Hamano]

Jonathan Tan <jonathantanmy@google.com> writes:

>> I do not mind taking the approach as a prudent and careful thing,
>> but I want the question answered regardless, as I know Jonathan is
>> in a good position to tell if this is just a theoretical issue than
>> I am, and depending on the answer, we may rethink the approach of
>> trying to be overly careful.
>
> From what I see, this is just a theoretical issue for now. (I spotted it
> while looking at the code, not because of a bug report.)

If there is no actual damage, then probably the earlier "let's be
extra careful" Dscho mentioned may equally have been us being
unnecessarily cautious.  Assuming that you didn't apply this patch
to the internal version you ship to your developers---if you did,
then we truly gained no data from this exchange because the original
tightening had no chance to even cause the damage.

In any case, let's merge the loosening patch down to 'maint'.

Thanks for being careful.
.

Re: jk/committer-date-is-author-date-fix-simplify, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Tue, 27 Oct 2020, Junio C Hamano wrote:
>
>> * jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
>>  - am, sequencer: stop parsing our own committer ident
>>
>>  Code symplification.
>
> s/y/i/ ;-)

Thanks.

Re: ag/merge-strategies-in-c, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Tue, 27 Oct 2020, Junio C Hamano wrote:
>
>> * ag/merge-strategies-in-c (2020-10-06) 11 commits
>>  - sequencer: use the "octopus" merge 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-index: don't fork if the requested program is `git-merge-one-file'
>>  - merge-index: libify merge_one_path() and merge_all()
>>  - merge-one-file: rewrite in C
>>  - t6027: modernise tests
>>
>>  The resolve and octopus merge strategy backends have been rewritten
>>  in C.
>
> From where I sit, this is ready for `next`.

I just went back to the thread.

https://lore.kernel.org/git/20201005122646.27994-1-alban.gruin@gmail.com/

It seems that the topic saw quite a few comments and help by Phillip
Wood in its earliest iteration, but I didn't see any review from
those other than myself on the last iteration v3, and the review
comments on the iteration haven't been acted upon yet.

That was why I threw the topic in "needs review" bucket.  The later
half of the series got no comments (I lost steam after reviewing the
earlier half) and I suspect they would have be adjusted for fixes
and improvements done to polish the earlier parts, so I am not sure
where your "ready for 'next'" comes from.

Thanks.

Re: ag/merge-strategies-in-c, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Alban Gruin]

Hi Junio & Johannes,

Le 02/11/2020 à 22:36, Junio C Hamano a écrit :
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
>> On Tue, 27 Oct 2020, Junio C Hamano wrote:
>>
>>> * ag/merge-strategies-in-c (2020-10-06) 11 commits
>>>  - sequencer: use the "octopus" merge 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-index: don't fork if the requested program is `git-merge-one-file'
>>>  - merge-index: libify merge_one_path() and merge_all()
>>>  - merge-one-file: rewrite in C
>>>  - t6027: modernise tests
>>>
>>>  The resolve and octopus merge strategy backends have been rewritten
>>>  in C.
>>
>> From where I sit, this is ready for `next`.
> 
> I just went back to the thread.
> 
> https://lore.kernel.org/git/20201005122646.27994-1-alban.gruin@gmail.com/
> 
> It seems that the topic saw quite a few comments and help by Phillip
> Wood in its earliest iteration, but I didn't see any review from
> those other than myself on the last iteration v3, and the review
> comments on the iteration haven't been acted upon yet.
> 
> That was why I threw the topic in "needs review" bucket.  The later
> half of the series got no comments (I lost steam after reviewing the
> earlier half) and I suspect they would have be adjusted for fixes
> and improvements done to polish the earlier parts, so I am not sure
> where your "ready for 'next'" comes from.
> 
> Thanks.
> 

Sorry, I am short on time to work on this these days, but I’m still
planning to apply Junio’s latest suggestions.  So I agree with you, this
is not yet ready for `next'.

Cheers,
Alban

Re: ag/merge-strategies-in-c, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Junio C Hamano]

Alban Gruin <alban.gruin@gmail.com> writes:

>> I just went back to the thread.
>> 
>> https://lore.kernel.org/git/20201005122646.27994-1-alban.gruin@gmail.com/
>> 
>> It seems that the topic saw quite a few comments and help by Phillip
>> Wood in its earliest iteration, but I didn't see any review from
>> those other than myself on the last iteration v3, and the review
>> comments on the iteration haven't been acted upon yet.
>> 
>> That was why I threw the topic in "needs review" bucket.  The later
>> half of the series got no comments (I lost steam after reviewing the
>> earlier half) and I suspect they would have be adjusted for fixes
>> and improvements done to polish the earlier parts, so I am not sure
>> where your "ready for 'next'" comes from.
>> 
>> Thanks.
>
> Sorry, I am short on time to work on this these days, but I’m still
> planning to apply Junio’s latest suggestions.  So I agree with you, this
> is not yet ready for `next'.

Thanks for a status update.  Be well and happy hacking ;-)

Re: sj/untracked-files-in-submodule-directory-is-not-dirty, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

>> * sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
>>  - diff: do not show submodule with untracked files as "-dirty"
>>
>>  "git diff" showed a submodule working tree with untracked cruft as
>>  "Submodule commit <objectname>-dirty", but a natural expectation is
>>  that the "-dirty" indicator would align with "git describe --dirty",
>>  which does not consider having untracked files in the working tree
>>  as source of dirtiness.  The inconsistency has been fixed.
>>
>>  Needs doc update.
>
> I *think* the original rationale for marking submodules with untracked
> (_un-ignored_) files was to avoid deleting a submodule that has
> uncommitted (because untracked) files.

I agree with you that that the motivation was exactly that, but I
have a suspicion that its execution was misguided.

> This patch affects e.g. if some script wants to determine whether a
> submodule can be deleted safely and uses `git diff` to do so. With this
> patch, it is possible to lose data irretrievably.

Let's play devil's advocate.

When one has a subdirectory D where one might or might not have an
untracked new file that one does not want to lose, but one otherwise
would want to clean up (perhaps an errant process created tons of
garbage files in the directory), one would not

	git diff D

to see if there are important changes in that directory before doing

	rm -rf D && git checkout D

to bring it back to pristine state, exactly because one would not
want to lose newly-created but not added files.  One would instead
use

	git status D

for checking.  Why would a user change the habit when D happens to
be a submodule?

So I would say that "git status [D]", if it does not let the user
notice that there is untracked contents in the submodule working
tree, would be a bad idea.  "git diff" that ignores untracked paths
in the submodule working tree, on the other hand, is a good thing.

Now, the patch as-is may change the behaviour of "git status D" in
this case, and the internal invocation of diff-files made somewhere
in wt-status.c may have to be adjusted to keep such a submodule with
forgotten newly created files shown as modified.

Further discussion on this should be done on the original review
thread for continuity, not here, in any case.

Thanks.

Re: ag/merge-strategies-in-c, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

[Johannes Schindelin]

Hi Junio,

On Mon, 2 Nov 2020, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Tue, 27 Oct 2020, Junio C Hamano wrote:
> >
> >> * ag/merge-strategies-in-c (2020-10-06) 11 commits
> >>  - sequencer: use the "octopus" merge 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-index: don't fork if the requested program is `git-merge-one-file'
> >>  - merge-index: libify merge_one_path() and merge_all()
> >>  - merge-one-file: rewrite in C
> >>  - t6027: modernise tests
> >>
> >>  The resolve and octopus merge strategy backends have been rewritten
> >>  in C.
> >
> > From where I sit, this is ready for `next`.
>
> I just went back to the thread.
>
> https://lore.kernel.org/git/20201005122646.27994-1-alban.gruin@gmail.com/
>
> It seems that the topic saw quite a few comments and help by Phillip
> Wood in its earliest iteration, but I didn't see any review from
> those other than myself on the last iteration v3, and the review
> comments on the iteration haven't been acted upon yet.
>
> That was why I threw the topic in "needs review" bucket.  The later
> half of the series got no comments (I lost steam after reviewing the
> earlier half) and I suspect they would have be adjusted for fixes
> and improvements done to polish the earlier parts, so I am not sure
> where your "ready for 'next'" comes from.

Sorry, I had missed your latest suggestion had not been addressed yet.
Maybe I am a bit over-eager to get rid of those scripts...

Ciao,
Dscho