Skip to main content

Browse the archive

swh:1:snp:bb8853bfef8fcf2b1d37fd6404912c7606c98e48
sort by:
Revision Author Date Message Commit Date
61a22dd Junio C Hamano 02 November 2023, 07:38:18 UTC Git 2.42.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 November 2023, 07:59:16 UTC
b8e45c5 Junio C Hamano 02 November 2023, 07:53:28 UTC Merge branch 'ms/doc-push-fix' into maint-2.42 Docfix. * ms/doc-push-fix: git-push doc: more visibility for -q option 02 November 2023, 07:53:28 UTC
fdb233c Junio C Hamano 02 November 2023, 07:53:28 UTC Merge branch 'jc/commit-new-underscore-index-fix' into maint-2.42 Message fix. * jc/commit-new-underscore-index-fix: commit: do not use cryptic "new_index" in end-user facing messages 02 November 2023, 07:53:28 UTC
d373ec0 Junio C Hamano 02 November 2023, 07:53:27 UTC Merge branch 'wx/merge-ort-comment-typofix' into maint-2.42 Typofix. * wx/merge-ort-comment-typofix: merge-ort.c: fix typo 'neeed' to 'needed' 02 November 2023, 07:53:27 UTC
8a26aaa Junio C Hamano 02 November 2023, 07:53:27 UTC Merge branch 'ps/git-repack-doc-fixes' into maint-2.42 Doc updates. * ps/git-repack-doc-fixes: doc/git-repack: don't mention nonexistent "--unpacked" option doc/git-repack: fix syntax for `-g` shorthand option 02 November 2023, 07:53:27 UTC
382d55a Junio C Hamano 02 November 2023, 07:53:27 UTC Merge branch 'ni/die-message-fix-for-git-add' into maint-2.42 Message updates. * ni/die-message-fix-for-git-add: builtin/add.c: clean up die() messages 02 November 2023, 07:53:27 UTC
f868596 Junio C Hamano 02 November 2023, 07:53:27 UTC Merge branch 'jc/am-doc-whitespace-action-fix' into maint-2.42 Docfix. * jc/am-doc-whitespace-action-fix: am: align placeholder for --whitespace option with apply 02 November 2023, 07:53:27 UTC
a40b8e9 Junio C Hamano 02 November 2023, 07:53:26 UTC Merge branch 'jc/update-list-references-to-lore' into maint-2.42 Doc update. * jc/update-list-references-to-lore: doc: update list archive reference to use lore.kernel.org 02 November 2023, 07:53:27 UTC
3a16179 Junio C Hamano 02 November 2023, 07:53:26 UTC Merge branch 'ps/rewritten-is-per-worktree-doc' into maint-2.42 Doc update. * ps/rewritten-is-per-worktree-doc: doc/git-worktree: mention "refs/rewritten" as per-worktree refs 02 November 2023, 07:53:26 UTC
f6a5676 Junio C Hamano 02 November 2023, 07:53:26 UTC Merge branch 'sn/cat-file-doc-update' into maint-2.42 "git cat-file" documentation updates. * sn/cat-file-doc-update: doc/cat-file: make synopsis and description less confusing 02 November 2023, 07:53:26 UTC
f92cea1 Junio C Hamano 02 November 2023, 07:53:26 UTC Merge branch 'jk/decoration-and-other-leak-fixes' into maint-2.42 Leakfix. * jk/decoration-and-other-leak-fixes: daemon: free listen_addr before returning revision: clear decoration structs during release_revisions() decorate: add clear_decoration() function 02 November 2023, 07:53:26 UTC
1e315ca Junio C Hamano 02 November 2023, 07:53:26 UTC Merge branch 'rs/parse-opt-ctx-cleanup' into maint-2.42 Code clean-up. * rs/parse-opt-ctx-cleanup: parse-options: drop unused parse_opt_ctx_t member 02 November 2023, 07:53:26 UTC
fa5799c Junio C Hamano 02 November 2023, 07:53:25 UTC Merge branch 'ob/am-msgfix' into maint-2.42 The parameters to generate an error message have been corrected. * ob/am-msgfix: am: fix error message in parse_opt_show_current_patch() 02 November 2023, 07:53:25 UTC
8a5b2e1 Junio C Hamano 02 November 2023, 07:53:25 UTC Merge branch 'hy/doc-show-is-like-log-not-diff-tree' into maint-2.42 Doc update. * hy/doc-show-is-like-log-not-diff-tree: show doc: redirect user to git log manual instead of git diff-tree 02 November 2023, 07:53:25 UTC
965d445 Junio C Hamano 02 November 2023, 07:53:25 UTC Merge branch 'ch/clean-docfix' into maint-2.42 Typofix. * ch/clean-docfix: git-clean doc: fix "without do cleaning" typo 02 November 2023, 07:53:25 UTC
905765b Junio C Hamano 02 November 2023, 07:53:24 UTC Merge branch 'eg/config-type-path-docfix' into maint-2.42 Typofix. * eg/config-type-path-docfix: git-config: fix misworded --type=path explanation 02 November 2023, 07:53:25 UTC
71c614b Junio C Hamano 02 November 2023, 07:53:24 UTC Merge branch 'ob/t3404-typofix' into maint-2.42 Code clean-up. * ob/t3404-typofix: t3404-rebase-interactive.sh: fix typos in title of a rewording test 02 November 2023, 07:53:24 UTC
cd41f66 Junio C Hamano 02 November 2023, 07:53:24 UTC Merge branch 'ob/sequencer-remove-dead-code' into maint-2.42 Code clean-up. * ob/sequencer-remove-dead-code: sequencer: remove unreachable exit condition in pick_commits() 02 November 2023, 07:53:24 UTC
f76827d Junio C Hamano 02 November 2023, 07:53:24 UTC Merge branch 'rs/name-rev-use-opt-hidden-bool' into maint-2.42 Simplify use of parse-options API a bit. * rs/name-rev-use-opt-hidden-bool: name-rev: use OPT_HIDDEN_BOOL for --peel-tag 02 November 2023, 07:53:24 UTC
2fdfd75 Junio C Hamano 02 November 2023, 07:53:23 UTC Merge branch 'rs/grep-parseopt-simplify' into maint-2.42 Simplify use of parse-options API a bit. * rs/grep-parseopt-simplify: grep: use OPT_INTEGER_F for --max-depth 02 November 2023, 07:53:24 UTC
18e0648 Junio C Hamano 02 November 2023, 07:53:23 UTC Merge branch 'ob/sequencer-reword-error-message' into maint-2.42 Update an error message (which would probably never been seen). * ob/sequencer-reword-error-message: sequencer: fix error message on failure to copy SQUASH_MSG 02 November 2023, 07:53:23 UTC
535b30e Junio C Hamano 02 November 2023, 07:53:23 UTC Merge branch 'bc/more-git-var' into maint-2.42 Fix-up for a topic that already has graduated. * bc/more-git-var: var: avoid a segmentation fault when `HOME` is unset 02 November 2023, 07:53:23 UTC
0510d06 Junio C Hamano 02 November 2023, 07:53:22 UTC Merge branch 'jk/ci-retire-allow-ref' into maint-2.42 CI update. * jk/ci-retire-allow-ref: ci: deprecate ci/config/allow-ref script ci: allow branch selection through "vars" 02 November 2023, 07:53:23 UTC
1a3712f Junio C Hamano 02 November 2023, 07:53:22 UTC Merge branch 'ws/git-svn-retire-faketerm' into maint-2.42 Code clean-up. * ws/git-svn-retire-faketerm: git-svn: drop FakeTerm hack 02 November 2023, 07:53:22 UTC
43af214 Junio C Hamano 02 November 2023, 07:53:22 UTC Merge branch 'ch/t6300-verify-commit-test-cleanup' into maint-2.42 Test clean-up. * ch/t6300-verify-commit-test-cleanup: t/t6300: drop magic filtering t/lib-gpg: forcibly run a trustdb update 02 November 2023, 07:53:22 UTC
7c7f6d8 Junio C Hamano 02 November 2023, 07:53:22 UTC Merge branch 'jc/mv-d-to-d-error-message-fix' into maint-2.42 Typofix in an error message. * jc/mv-d-to-d-error-message-fix: mv: fix error for moving directory to another 02 November 2023, 07:53:22 UTC
9d4a69f Junio C Hamano 02 November 2023, 07:53:21 UTC Merge branch 'ja/worktree-orphan' into maint-2.42 Typofix in an error message. * ja/worktree-orphan: builtin/worktree.c: fix typo in "forgot fetch" msg 02 November 2023, 07:53:21 UTC
8db7d2d Junio C Hamano 02 November 2023, 07:53:21 UTC Merge branch 'ob/t9001-indent-fix' into maint-2.42 Test style fix. * ob/t9001-indent-fix: t9001: fix indentation in test_no_confirm() 02 November 2023, 07:53:21 UTC
b50a670 Junio C Hamano 02 November 2023, 07:53:20 UTC Merge branch 'jk/function-pointer-mismatches-fix' into maint-2.42 Code clean-up to please clang-18. * jk/function-pointer-mismatches-fix: hashmap: use expected signatures for comparison functions 02 November 2023, 07:53:21 UTC
9ae84d2 Junio C Hamano 02 November 2023, 07:53:20 UTC Merge branch 'ds/upload-pack-error-sequence-fix' into maint-2.42 Error message generation fix. * ds/upload-pack-error-sequence-fix: upload-pack: fix exit code when denying fetch of unreachable object ID upload-pack: fix race condition in error messages 02 November 2023, 07:53:20 UTC
c78718c Junio C Hamano 02 November 2023, 07:53:20 UTC Merge branch 'ws/git-push-doc-grammofix' into maint-2.42 Doc update. * ws/git-push-doc-grammofix: git-push.txt: fix grammar 02 November 2023, 07:53:20 UTC
07011e1 Junio C Hamano 02 November 2023, 07:53:20 UTC Merge branch 'jk/test-pass-ubsan-options-to-http-test' into maint-2.42 UBSAN options were not propagated through the test framework to git run via the httpd, unlike ASAN options, which has been corrected. * jk/test-pass-ubsan-options-to-http-test: test-lib: set UBSAN_OPTIONS to match ASan 02 November 2023, 07:53:20 UTC
584cde7 Junio C Hamano 02 November 2023, 07:53:19 UTC Merge branch 'tb/send-email-extract-valid-address-error-message-fix' into maint-2.42 An error message given by "git send-email" when given a malformed address did not give correct information, which has been corrected. * tb/send-email-extract-valid-address-error-message-fix: git-send-email.perl: avoid printing undef when validating addresses 02 November 2023, 07:53:20 UTC
2a68061 Junio C Hamano 02 November 2023, 07:53:19 UTC Merge branch 'jk/redact-h2h3-headers-fix' into maint-2.42 HTTP Header redaction code has been adjusted for a newer version of cURL library that shows its traces differently from earlier versions. * jk/redact-h2h3-headers-fix: http: update curl http/2 info matching for curl 8.3.0 http: factor out matching of curl http/2 trace lines 02 November 2023, 07:53:19 UTC
83442de Junio C Hamano 02 November 2023, 07:53:19 UTC Merge branch 'pb/completion-aliases-doc' into maint-2.42 Clarify how "alias.foo = : git cmd ; aliased-command-string" should be spelled with necessary whitespaces around punctuation marks to work. * pb/completion-aliases-doc: completion: improve doc for complex aliases 02 November 2023, 07:53:19 UTC
2fd4378 Junio C Hamano 02 November 2023, 07:53:19 UTC Merge branch 'js/diff-cached-fsmonitor-fix' into maint-2.42 "git diff --cached" codepath did not fill the necessary stat information for a file when fsmonitor knows it is clean and ended up behaving as if it is not clean, which has been corrected. * js/diff-cached-fsmonitor-fix: diff-lib: fix check_removed when fsmonitor is on 02 November 2023, 07:53:19 UTC
56ee4a3 Junio C Hamano 02 November 2023, 07:53:18 UTC Merge branch 'js/systemd-timers-wsl-fix' into maint-2.42 Update "git maintainance" timers' implementation based on systemd timers to work with WSL. * js/systemd-timers-wsl-fix: maintenance(systemd): support the Windows Subsystem for Linux 02 November 2023, 07:53:18 UTC
bfb8376 Junio C Hamano 02 November 2023, 07:53:18 UTC Merge branch 'pw/diff-no-index-from-named-pipes' into maint-2.42 "git diff --no-index -R <(one) <(two)" did not work correctly, which has been corrected. * pw/diff-no-index-from-named-pipes: diff --no-index: fix -R with stdin 02 November 2023, 07:53:18 UTC
d12df94 Junio C Hamano 02 November 2023, 07:53:18 UTC Merge branch 'js/complete-checkout-t' into maint-2.42 The completion script (in contrib/) has been taught to treat the "-t" option to "git checkout" and "git switch" just like the "--track" option, to complete remote-tracking branches. * js/complete-checkout-t: completion(switch/checkout): treat --track and -t the same 02 November 2023, 07:53:18 UTC
17ab51e Junio C Hamano 02 November 2023, 07:53:17 UTC Merge branch 'rs/grep-no-no-or' into maint-2.42 "git grep -e A --no-or -e B" is accepted, even though the negation of "or" did not mean anything, which has been tightened. * rs/grep-no-no-or: grep: reject --no-or 02 November 2023, 07:53:18 UTC
9a4ae43 Junio C Hamano 02 November 2023, 07:53:17 UTC Merge branch 'so/diff-doc-for-patch-update' into maint-2.42 References from description of the `--patch` option in various manual pages have been simplified and improved. * so/diff-doc-for-patch-update: doc/diff-options: fix link to generating patch section 02 November 2023, 07:53:17 UTC
a70f725 Junio C Hamano 02 November 2023, 07:53:17 UTC Merge branch 'pw/rebase-i-after-failure' into maint-2.42 Various fixes to the behaviour of "rebase -i" when the command got interrupted by conflicting changes. cf. <6b927687-cf6e-d73e-78fb-bd4f46736928@gmx.de> * pw/rebase-i-after-failure: rebase -i: fix adding failed command to the todo list rebase --continue: refuse to commit after failed command rebase: fix rewritten list for failed pick sequencer: factor out part of pick_commits() sequencer: use rebase_path_message() rebase -i: remove patch file after conflict resolution rebase -i: move unlink() calls 02 November 2023, 07:53:17 UTC
d97034b Junio C Hamano 02 November 2023, 07:53:16 UTC Merge branch 'ks/ref-filter-sort-numerically' into maint-2.42 "git for-each-ref --sort='contents:size'" sorts the refs according to size numerically, giving a ref that points at a blob twelve-byte (12) long before showing a blob hundred-byte (100) long. * ks/ref-filter-sort-numerically: ref-filter: sort numerically when ":size" is used 02 November 2023, 07:53:17 UTC
57b52ce Junio C Hamano 02 November 2023, 07:53:16 UTC Merge branch 'jk/diff-result-code-cleanup' into maint-2.42 "git diff --no-such-option" and other corner cases around the exit status of the "diff" command has been corrected. * jk/diff-result-code-cleanup: diff: drop useless "status" parameter from diff_result_code() diff: drop useless return values in git-diff helpers diff: drop useless return from run_diff_{files,index} functions diff: die when failing to read index in git-diff builtin diff: show usage for unknown builtin_diff_files() options diff-files: avoid negative exit value diff: spell DIFF_INDEX_CACHED out when calling run_diff_index() 02 November 2023, 07:53:16 UTC
a00b112 Junio C Hamano 02 November 2023, 07:53:16 UTC Merge branch 'ob/sequencer-empty-hint-fix' into maint-2.42 The use of API between two calls to require_clean_work_tree() from the sequencer code has been cleaned up for consistency. * ob/sequencer-empty-hint-fix: sequencer: rectify empty hint in call of require_clean_work_tree() 02 November 2023, 07:53:16 UTC
7f8314f Junio C Hamano 02 November 2023, 07:53:16 UTC Merge branch 'ts/unpacklimit-config-fix' into maint-2.42 transfer.unpackLimit ought to be used as a fallback, but overrode fetch.unpackLimit and receive.unpackLimit instead. * ts/unpacklimit-config-fix: transfer.unpackLimit: fetch/receive.unpackLimit takes precedence 02 November 2023, 07:53:16 UTC
8764491 Junio C Hamano 02 November 2023, 07:53:15 UTC Merge branch 'jc/diff-exit-code-with-w-fixes' into maint-2.42 "git diff -w --exit-code" with various options did not work correctly, which is being addressed. * jc/diff-exit-code-with-w-fixes: diff: the -w option breaks --exit-code for --raw and other output modes t4040: remove test that succeeded for a wrong reason diff: teach "--stat -w --exit-code" to notice differences diff: mode-only change should be noticed by "--patch -w --exit-code" diff: move the fallback "--exit-code" code down 02 November 2023, 07:53:15 UTC
1ea39ad Junio C Hamano 02 November 2023, 07:53:15 UTC Merge branch 'tb/commit-graph-verify-fix' into maint-2.42 The commit-graph verification code that detects mixture of zero and non-zero generation numbers has been updated. * tb/commit-graph-verify-fix: commit-graph: avoid repeated mixed generation number warnings t/t5318-commit-graph.sh: test generation zero transitions during fsck commit-graph: verify swapped zero/non-zero generation cases commit-graph: introduce `commit_graph_generation_from_graph()` 02 November 2023, 07:53:15 UTC
ec7cc18 Junio C Hamano 02 November 2023, 07:53:15 UTC Merge branch 'jc/ci-skip-same-commit' into maint-2.42 Tweak GitHub Actions CI so that pushing the same commit to multiple branch tips at the same time will not waste building and testing the same thing twice. * jc/ci-skip-same-commit: ci: avoid building from the same commit in parallel 02 November 2023, 07:53:15 UTC
5075831 Junio C Hamano 02 November 2023, 07:53:14 UTC Merge branch 'ds/scalar-updates' into maint-2.42 Scalar updates. * ds/scalar-updates: scalar reconfigure: help users remove buggy repos setup: add discover_git_directory_reason() scalar: add --[no-]src option 02 November 2023, 07:53:15 UTC
396a167 Junio C Hamano 02 November 2023, 07:53:14 UTC Merge branch 'mp/rebase-label-length-limit' into maint-2.42 Overly long label names used in the sequencer machinery are now chopped to fit under filesystem limitation. * mp/rebase-label-length-limit: rebase: allow overriding the maximal length of the generated labels sequencer: truncate labels to accommodate loose refs 02 November 2023, 07:53:14 UTC
31730a3 Junio C Hamano 02 November 2023, 07:53:14 UTC Merge branch 'js/ci-coverity' into maint-2.42 GitHub CI workflow has learned to trigger Coverity check. * js/ci-coverity: coverity: detect and report when the token or project is incorrect coverity: allow running on macOS coverity: support building on Windows coverity: allow overriding the Coverity project coverity: cache the Coverity Build Tool ci: add a GitHub workflow to submit Coverity scans 02 November 2023, 07:53:14 UTC
6d68ab0 Junio C Hamano 02 November 2023, 07:53:14 UTC Merge branch 'jk/test-lsan-denoise-output' into maint-2.42 Tests with LSan from time to time seem to emit harmless message that makes our tests unnecessarily flakey; we work it around by filtering the uninteresting output. * jk/test-lsan-denoise-output: test-lib: ignore uninteresting LSan output 02 November 2023, 07:53:14 UTC
19ab8e8 Junio C Hamano 02 November 2023, 07:53:13 UTC Merge branch 'js/ci-san-skip-p4-and-svn-tests' into maint-2.42 Flakey "git p4" tests, as well as "git svn" tests, are now skipped in the (rather expensive) sanitizer CI job. * js/ci-san-skip-p4-and-svn-tests: ci(linux-asan-ubsan): let's save some time 02 November 2023, 07:53:13 UTC
fc0269b Junio C Hamano 02 November 2023, 07:53:13 UTC Merge branch 'tb/mark-more-tests-as-leak-free' into maint-2.42 Tests that are known to pass with LSan are now marked as such. * tb/mark-more-tests-as-leak-free: leak tests: mark t5583-push-branches.sh as leak-free leak tests: mark t3321-notes-stripspace.sh as leak-free leak tests: mark a handful of tests as leak-free 02 November 2023, 07:53:13 UTC
243c79f 王常新 22 October 2023, 02:46:08 UTC merge-ort.c: fix typo 'neeed' to 'needed' Signed-off-by: 王常新 <wchangxin824@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 October 2023, 06:13:49 UTC
f6d83e2 Michal Suchanek 20 October 2023, 18:45:21 UTC git-push doc: more visibility for -q option The "-v" option is shown in the SYNOPSIS section near the top, but "-q" is not shown anywhere there. List "-q" alongside "-v". Signed-off-by: Michal Suchanek <msuchanek@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 October 2023, 22:13:38 UTC
14d569b Junio C Hamano 18 October 2023, 23:35:06 UTC am: align placeholder for --whitespace option with apply `git am` passes the value given to its `--whitespace` option through to the underlying `git apply`, and the value is called <action> over there. Fix the documentation for the command that calls the value <option> to say <action> instead. Note that the option help given by `git am -h` already calls the value <action>, so there is no need to make a matching change there. Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 October 2023, 23:35:44 UTC
a060705 Junio C Hamano 18 October 2023, 03:08:51 UTC commit: do not use cryptic "new_index" in end-user facing messages These error messages say "new_index" as if that spelling has some significance to the end users (e.g. the file "$GIT_DIR/new_index" has some issues), but that is not the case at all. The i18n folks were made to include the word literally in the translated messages, which was not a good idea at all. Spell it "new index", as we are just telling the users that we failed to create a new index file. The term is expected to be translated to the end-users' languages, not left as if it were a literal file name. This dates all the way back to the first re-implemenation of "git commit" command in C (the scripted version did not have such wording in its error messages), in f5bbc322 (Port git commit to C., 2007-11-08). Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 October 2023, 05:09:54 UTC
48399e9 Naomi Ibe 17 October 2023, 11:39:45 UTC builtin/add.c: clean up die() messages As described in the CodingGuidelines document, a single line message given to die() and its friends should not capitalize its first word, and should not add full-stop at the end. Signed-off-by: Naomi Ibe <naomi.ibeh69@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 October 2023, 19:41:55 UTC
ca3285d Patrick Steinhardt 16 October 2023, 07:19:56 UTC doc/git-repack: don't mention nonexistent "--unpacked" option The documentation for geometric repacking mentions a "--unpacked" option that supposedly changes how loose objects are rolled up. This option has never existed, and the implied behaviour, namely to include all unpacked objects into the resulting packfile, is in fact the default behaviour. Correct the documentation to not mention this option. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 October 2023, 21:21:59 UTC
e9cc3a0 Patrick Steinhardt 16 October 2023, 07:19:51 UTC doc/git-repack: fix syntax for `-g` shorthand option The `-g` switch is a shorthand for `--geometric=` and allows the user to specify the geometric. The documentation is wrong though and indicates that the syntax for the shorthand is `-g=<factor>`. In fact though, the option must be specified without the equals sign via `-g<factor>`. Fix the syntax accordingly. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 October 2023, 21:21:59 UTC
8b3aa36 Patrick Steinhardt 10 October 2023, 11:01:26 UTC doc/git-worktree: mention "refs/rewritten" as per-worktree refs Some references are special in the context of worktrees as they are considered to be per-worktree instead of shared across all of the worktrees. Most importantly, this includes "refs/worktree/" that have explicitly been designed such that users can create per-woorktree refs. But there are also special references that have an associated meaning like "refs/bisect/", which is used to track state of git-bisect(1). These special per-worktree references are documented in git-worktree(1), but one instance is missing. In a9be29c9817 (sequencer: make refs generated by the `label` command worktree-local, 2018-04-25), we have converted "refs/rewritten/" to be a per-worktree reference as well. These references are used by our sequencer infrastructure to generate labels for rebased commits. So in order to allow for multiple concurrent rebases to happen in different worktrees, these references need to be tracked per worktree. We forgot to update our documentation to mention these new per-worktree references, which is fixed by this patch. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 October 2023, 16:23:16 UTC
cebfaaa Štěpán Němec 09 October 2023, 17:56:04 UTC doc/cat-file: make synopsis and description less confusing The DESCRIPTION's "first form" is actually the 1st, 2nd, 3rd and 5th form in SYNOPSIS, the "second form" is the 4th one. Interestingly, this state of affairs was introduced in 97fe7250753b (cat-file docs: fix SYNOPSIS and "-h" output, 2021-12-28) with the claim of "Now the two will match again." ("the two" being DESCRIPTION and SYNOPSIS)... The description also suffers from other correctness and clarity issues, e.g., the "first form" paragraph discusses -p, -s and -t, but leaves out -e, which is included in the corresponding SYNOPSIS section; the second paragraph mentions <format>, which doesn't occur in SYNOPSIS at all, and of the three batch options, really only describes the behavior of --batch-check. Also the mention of "drivers" seems an implementation detail not adding much clarity in a short summary (and isn't expanded upon in the rest of the man page, either). Rather than trying to maintain one-to-one (or N-to-M) correspondence between the DESCRIPTION and SYNOPSIS forms, creating duplication and providing opportunities for error, shorten the former into a concise summary describing the two general modes of operation: batch and non-batch, leaving details to the subsequent manual sections. While here, fix a grammar error in the description of -e and make the following further minor improvements: NAME: shorten ("content or type and size" isn't the whole story; say "details" and leave the actual details to later sections) SYNOPSIS and --help: move the (--textconv | --filters) form before --batch, closer to the other non-batch forms Signed-off-by: Štěpán Němec <stepnem@smrk.net> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 October 2023, 19:46:33 UTC
ffbf6a7 Junio C Hamano 06 October 2023, 22:57:03 UTC doc: update list archive reference to use lore.kernel.org No disrespect to other mailing list archives, but the local part of their URLs will become pretty much meaningless once the archives go out of service, and we learned the lesson hard way when $gmane stopped serving. Let's point into https://lore.kernel.org/ for an article that can be found there, because the local part of the URL has the Message-Id: that can be used to find the same message in other archives, even if lore goes down. Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 October 2023, 23:46:59 UTC
badf2fe Jeff King 05 October 2023, 21:33:26 UTC daemon: free listen_addr before returning We build up a string list of listen addresses from the command-line arguments, but never free it. This causes t5811 to complain of a leak (though curiously it seems to do so only when compiled with gcc, not with clang). To handle this correctly, we have to do a little refactoring: - there are two exit points from the main function, depending on whether we are entering the main loop or serving a single client (since rather than a traditional fork model, we re-exec ourselves with the extra "--serve" argument to accommodate Windows). We don't need --listen at all in the --serve case, of course, but it is passed along by the parent daemon, which simply copies all of the command-line options it got. - we just "return serve()" to run the main loop, giving us no chance to do any cleanup So let's use a "ret" variable to store the return code, and give ourselves a single exit point at the end. That gives us one place to do cleanup. Note that this code also uses the "use a no-dup string-list, but allocate strings we add to it" trick, meaning string_list_clear() will not realize it should free them. We can fix this by switching to a "dup" string-list, but using the "append_nodup" function to add to it (this is preferable to tweaking the strdup_strings flag before clearing, as it puts all the subtle memory-ownership code together). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 October 2023, 21:54:58 UTC
8ef8da4 Jeff King 05 October 2023, 21:30:14 UTC revision: clear decoration structs during release_revisions() The point of release_revisions() is to free memory associated with the rev_info struct, but we have several "struct decoration" members that are left untouched. Since the previous commit introduced a function to do that, we can just call it. We do have to provide some specialized callbacks to map the void pointers onto real ones (the alternative would be casting the existing function pointers; this generally works because "void *" is usually interchangeable with a struct pointer, but it is technically forbidden by the standard). Since the line-log code does not expose the type it stores in the decoration (nor of course the function to free it), I put this behind a generic line_log_free() entry point. It's possible we may need to add more line-log specific bits anyway (running t4211 shows a number of other leaks in the line-log code). While this doubtless cleans up many leaks triggered by the test suite, the only script which becomes leak-free is t4217, as it does very little beyond a simple traversal (its existing leak was from the use of --children, which is now fixed). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 October 2023, 21:54:57 UTC
7718682 Jeff King 05 October 2023, 21:29:02 UTC decorate: add clear_decoration() function There's not currently any way to free the resources associated with a decoration struct. As a result, we have several memory leaks which cannot easily be plugged. Let's add a "clear" function and make use of it in the example code of t9004. This removes the only leak from that script, so we can mark it as passing the leak sanitizer. Curiously this leak is found only when running SANITIZE=leak with clang, but not with gcc. But it is a bog-standard leak: we allocate some memory in a local variable struct, and then exit main() without releasing it. I'm not sure why gcc doesn't find it. After this patch, both compilers report it as leak-free. Note that the clear function takes a callback to free the individual entries. That's not needed for our example (which is just decorating with ints), but will be for real callers. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 October 2023, 21:54:55 UTC
3349520 Johannes Schindelin 25 September 2023, 11:51:02 UTC coverity: detect and report when the token or project is incorrect When trying to obtain the MD5 of the Coverity Scan Tool (in order to decide whether a cached version can be used or a new version has to be downloaded), it is possible to get a 401 (Authorization required) due to either an incorrect token, or even more likely due to an incorrect Coverity project name. Seeing an authorization failure that is caused by an incorrect project name was somewhat surprising to me when developing the Coverity workflow, as I found such a failure suggestive of an incorrect token instead. So let's provide a helpful error message about that specifically when encountering authentication issues. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 October 2023, 18:45:46 UTC
f4cbb32 René Scharfe 03 October 2023, 08:55:21 UTC parse-options: drop unused parse_opt_ctx_t member 5c387428f1 (parse-options: don't emit "ambiguous option" for aliases, 2019-04-29) added "updated_options" to struct parse_opt_ctx_t, but it has never been used. Remove it. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 October 2023, 20:15:03 UTC
c13d2ad Johannes Schindelin 25 September 2023, 11:51:01 UTC coverity: allow running on macOS For completeness' sake, let's add support for submitting macOS builds to Coverity Scan. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2023, 17:12:49 UTC
d3c3ffa Johannes Schindelin 25 September 2023, 11:51:00 UTC coverity: support building on Windows By adding the repository variable `ENABLE_COVERITY_SCAN_ON_OS` with a value, say, `["windows-latest"]`, this GitHub workflow now runs on Windows, allowing to analyze Windows-specific issues. This allows, say, the Git for Windows fork to submit Windows builds to Coverity Scan instead of Linux builds. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2023, 17:12:49 UTC
7bc49e8 Johannes Schindelin 25 September 2023, 11:50:59 UTC coverity: allow overriding the Coverity project By default, the builds are submitted to the `git` project at https://scan.coverity.com/projects/git. The Git for Windows project would like to use this workflow, too, though, and needs the builds to be submitted to the `git-for-windows` Coverity project. To that end, allow configuring the Coverity project name via the repository variable, you guessed it, `COVERITY_PROJECT`. The default if that variable is not configured or has an empty value is still `git`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2023, 17:12:49 UTC
002e5e9 Johannes Schindelin 25 September 2023, 11:50:58 UTC coverity: cache the Coverity Build Tool It would add a 1GB+ download for every run, better cache it. This is inspired by the GitHub Action `vapier/coverity-scan-action`, however, it uses the finer-grained `restore`/`save` method to be able to cache the Coverity Build Tool even if an unrelated step in the GitHub workflow fails later on. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2023, 17:12:48 UTC
a56b623 Johannes Schindelin 25 September 2023, 11:50:57 UTC ci: add a GitHub workflow to submit Coverity scans Coverity is a static analysis tool that detects and generates reports on various security and code quality issues. It is particularly useful when diagnosing memory safety issues which may be used as part of exploiting a security vulnerability. Coverity's website provides a service that accepts "builds" (which contains the object files generated during a standard build as well as a database generated by Coverity's scan tool). Let's add a GitHub workflow to automate all of this. To avoid running it without appropriate Coverity configuration (e.g. the token required to use Coverity's services), the job only runs when the repository variable "ENABLE_COVERITY_SCAN_FOR_BRANCHES" has been configured accordingly (see https://docs.github.com/en/actions/learn-github-actions/variables for details how to configure repository variables): It is expected to be a valid JSON array of branch strings, e.g. `["main", "next"]`. In addition, this workflow requires two repository secrets: - COVERITY_SCAN_EMAIL: the email to send the report to, and - COVERITY_SCAN_TOKEN: the Coverity token (look in the Project Settings tab of your Coverity project). Note: The initial version of this patch used `vapier/coverity-scan-action` to benefit from that Action's caching of the Coverity tool, which is rather large. Sadly, that Action only supports Linux, and we want to have the option of building on Windows, too. Besides, in the meantime Coverity requires `cov-configure` to be runantime, and that Action was not adjusted accordingly, i.e. it seems not to be maintained actively. Therefore it would seem prudent to implement the steps manually instead of using that Action. Initial-patch-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2023, 17:12:48 UTC
252d693 Jeff King 21 September 2023, 04:18:25 UTC test-lib: set UBSAN_OPTIONS to match ASan For a long time we have used ASAN_OPTIONS to set abort_on_error. This is important because we want to notice detected problems even in programs which are expected to fail. But we never did the same for UBSAN_OPTIONS. This means that our UBSan test suite runs might silently miss some cases. It also causes a more visible effect, which is that t4058 complains about unexpected "fixes" (and this is how I noticed the issue): $ make SANITIZE=undefined CC=gcc && (cd t && ./t4058-*) ... ok 8 - git read-tree does not segfault # TODO known breakage vanished ok 9 - reset --hard does not segfault # TODO known breakage vanished ok 10 - git diff HEAD does not segfault # TODO known breakage vanished The tests themselves aren't that interesting. We have a known bug where these programs segfault, and they do when compiled without sanitizers. With UBSan, when the test runs: test_might_fail git read-tree --reset base it gets: cache-tree.c:935:9: runtime error: member access within misaligned address 0x5a5a5a5a5a5a5a5a for type 'struct cache_entry', which requires 8 byte alignment So that's garbage memory which would _usually_ cause us to segfault, but UBSan catches it and complains first about the alignment. That makes sense, but the weird thing is that UBSan then exits instead of aborting, so our test_might_fail call considers that an acceptable outcome and the test "passes". Curiously, this historically seems to have aborted, because I've run "make test" with UBSan many times (and so did our CI) and we never saw the problem. Even more curiously, I see an abort if I use clang with ASan and UBSan together, like: # this aborts! make SANITIZE=undefined,address CC=clang But not with just UBSan, and not with both when used with gcc: # none of these do make SANITIZE=undefined CC=gcc make SANITIZE=undefined CC=clang make SANITIZE=undefined,address CC=gcc Likewise moving to older versions of gcc (I tried gcc-11 and gcc-12 on my Debian system) doesn't abort. Nor does moving around in Git's history. Neither this test nor the relevant code have been touched in a while, and going back to v2.41.0 produces the same outcome (even though many UBSan CI runs have passed in the meantime). So _something_ changed on my system (and likely will soon on other people's, since this is stock Debian unstable), but I didn't track it further. I don't know why it ever aborted in the past, but we definitely should be explicit here and tell UBSan what we want to happen. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 September 2023, 21:10:36 UTC
43abaaf Oswald Buddenhagen 21 September 2023, 11:07:27 UTC am: fix error message in parse_opt_show_current_patch() The argument order was incorrect. This was introduced by 246cac8505 (i18n: turn even more messages into "cannot be used together" ones, 2022-01-05). Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 September 2023, 19:09:33 UTC
4fbe83f Han Young 20 September 2023, 13:27:31 UTC show doc: redirect user to git log manual instead of git diff-tree While git show accepts options that apply to the git diff-tree command, some options do not make sense in the context of git show. The options of git show are handled using the machinery of git log. The git log manual page is a better place to look into than git diff-tree for options that are not in the git show manual page. Signed-off-by: Han Young <hanyang.tony@bytedance.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 September 2023, 15:52:59 UTC
12288cc Taylor Blau 18 September 2023, 16:35:53 UTC git-send-email.perl: avoid printing undef when validating addresses When validating email addresses with `extract_valid_address_or_die()`, we print out a helpful error message when the given input does not contain a valid email address. However, the pre-image of this patch looks something like: my $address = shift; $address = extract_valid_address($address): die sprintf(__("..."), $address) if !$address; which fails when given a bogus email address by trying to use $address (which is undef) in a sprintf() expansion, like so: $ git.compile send-email --to="pi <pi@pi>" /tmp/x/*.patch --force Use of uninitialized value $address in sprintf at /home/ttaylorr/src/git/git-send-email line 1175. error: unable to extract a valid address from: This regression dates back to e431225569 (git-send-email: remove invalid addresses earlier, 2012-11-22), but became more noticeable in a8022c5f7b (send-email: expose header information to git-send-email's sendemail-validate hook, 2023-04-19), which validates SMTP headers in the sendemail-validate hook. Avoid trying to format an undef by storing the given and cleaned address separately. After applying this fix, the error contains the invalid email address, and the warning disappears: $ git.compile send-email --to="pi <pi@pi>" /tmp/x/*.patch --force error: unable to extract a valid address from: pi <pi@pi> Reported-by: Bagas Sanjaya <bagasdotme@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 September 2023, 19:04:30 UTC
563f339 Caleb Hill 15 September 2023, 17:53:29 UTC git-clean doc: fix "without do cleaning" typo "quit without do cleaning" is not grammatical. Signed-off-by: Caleb Hill <chill389cc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 September 2023, 23:05:01 UTC
58be114 Evan Gates 15 September 2023, 20:24:59 UTC git-config: fix misworded --type=path explanation When `--type=<type>` was added as a prefered alias for `--<type>` by fb0dc3bac1 (builtin/config.c: support `--type=<type>` as preferred alias for `--<type>`), the explanation for the path type was reworded. Whereas the previous explanation said "expand a leading `~`" this was changed to "adding a leading `~`". Change "adding" to "expanding" to correctly explain the canonicalization. Signed-off-by: Evan Gates <evan.gates@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 September 2023, 21:09:37 UTC
0763c3a Jeff King 15 September 2023, 11:34:43 UTC http: update curl http/2 info matching for curl 8.3.0 To redact header lines in http/2 curl traces, we have to parse past some prefix bytes that curl sticks in the info lines it passes to us. That changed once already, and we adapted in db30130165 (http: handle both "h2" and "h2h3" in curl info lines, 2023-06-17). Now it has changed again, in curl's fbacb14c4 (http2: cleanup trace messages, 2023-08-04), which was released in curl 8.3.0. Running a build of git linked against that version will fail to redact the trace (and as before, t5559 notices and complains). The format here is a little more complicated than the other ones, as it now includes a "stream id". This is not constant but is always numeric, so we can easily parse past it. We'll continue to match the old versions, of course, since we want to work with many different versions of curl. We can't even select one format at compile time, because the behavior depends on the runtime version of curl we use, not the version we build against. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 September 2023, 17:54:11 UTC
39fa527 Jeff King 15 September 2023, 11:33:16 UTC http: factor out matching of curl http/2 trace lines We have to parse out curl's http/2 trace lines so we can redact their headers. We already match two different types of lines from various vintages of curl. In preparation for adding another (which will be slightly more complex), let's pull the matching into its own function, rather than doing it in the middle of a conditional. While we're doing so, let's expand the comment a bit to describe the two matches. That probably should have been part of db30130165 (http: handle both "h2" and "h2h3" in curl info lines, 2023-06-17), but will become even more important as we add new types. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 September 2023, 17:54:08 UTC
4333267 Philippe Blain 12 September 2023, 17:02:15 UTC completion: improve doc for complex aliases The completion code can be told to use a particular completion for aliases that shell out by using ': git <cmd> ;' as the first command of the alias. This only works if <cmd> and the semicolon are separated by a space, since if the space is missing __git_aliased_command returns (for example) 'checkout;' instead of just 'checkout', and then __git_complete_command fails to find a completion for 'checkout;'. The examples have that space but it's not clear if it's just for style or if it's mandatory. Explicitly mention it. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 September 2023, 00:46:01 UTC
63642d5 Oswald Buddenhagen 12 September 2023, 10:55:41 UTC sequencer: remove unreachable exit condition in pick_commits() This was introduced by 56dc3ab04 ("sequencer (rebase -i): implement the 'edit' command", 2017-01-02), and was pointless from the get-go: all early exits from the loop above are returns, so todo_list->current == todo_list->nr is an invariant after the loop. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 September 2023, 00:32:09 UTC
8aae489 Oswald Buddenhagen 12 September 2023, 10:42:36 UTC t3404-rebase-interactive.sh: fix typos in title of a rewording test This test was introduced by commit 0c164ae7a ("rebase -i: add another reword test", 2021-08-20). I didn't quite get what it was meant to do, so here's an explanation from Phillip: The purpose of the test is to ensure that (i) There are no uncommitted changes when the editor runs. i.e., we commit without running the editor and then reword by amending that commit. This ensures that we have the same user experience whether or not the commit was fast-forwarded [1]. (ii) That the todo list is re-read after the commit has been reworded. This is to allow the user to update the todo list while the rebase is paused for editing the commit message. [1] https://lore.kernel.org/git/20190812175046.GM20404@szeder.dev/ Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 September 2023, 00:24:56 UTC
6a044a2 Josip Sokcevic 11 September 2023, 17:09:02 UTC diff-lib: fix check_removed when fsmonitor is on `git diff-index` may return incorrect deleted entries when fsmonitor is used in a repository with git submodules. This can be observed on Mac machines, but it can affect all other supported platforms too. If fsmonitor is used, `stat *st` is not initialized if cache_entry has CE_FSMONITOR_VALID set. But, there are three call sites that rely on stat afterwards, which can result in incorrect results. This change partially reverts commit 4f3d6d02 (fsmonitor: skip lstat deletion check during git diff-index, 2021-03-17). Signed-off-by: Josip Sokcevic <sokcevic@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 September 2023, 23:45:49 UTC
5e8515e Johannes Schindelin 10 September 2023, 08:30:20 UTC maintenance(systemd): support the Windows Subsystem for Linux When running in the Windows Subsystem for Linux (WSL), it is usually necessary to use the Git Credential Manager for authentication when performing the background fetches. This requires interoperability between the Windows Subsystem for Linux and the Windows host to work, which uses so-called vsocks, i.e. sockets intended for communcations between virtual machines and the host they are running on. However, when Git is configured to run background maintenance via `systemd`, the address families available to those maintenance processes are restricted, and did not include `AF_VSOCK`. This leads to problems e.g. when a background fetch tries to access github.com: systemd[437]: Starting Optimize Git repositories data... git[747387]: WSL (747387) ERROR: UtilBindVsockAnyPort:285: socket failed 97 git[747381]: fatal: could not read Username for 'https://github.com': No such device or address git[747381]: error: failed to prefetch remotes git[747381]: error: task 'prefetch' failed systemd[437]: git-maintenance@hourly.service: Main process exited, code=exited, status=1/FAILURE systemd[437]: git-maintenance@hourly.service: Failed with result 'exit-code'. systemd[437]: Failed to start Optimize Git repositories data. Address this (pun intended) by adding the `AF_VSOCK` address family to the allow list. This fixes https://github.com/microsoft/git/issues/604. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 September 2023, 19:41:30 UTC
48944f2 René Scharfe 09 September 2023, 22:12:52 UTC diff --no-index: fix -R with stdin When -R is given, queue_diff() swaps the mode and name variables of the two files to produce a reverse diff. 1e3f26542a (diff --no-index: support reading from named pipes, 2023-07-05) added variables that indicate whether files are special, i.e named pipes or - for stdin. These new variables were not swapped, though, which broke the handling of stdin with with -R. Swap them like the other metadata variables. Reported-by: Martin Storsjö <martin@martin.st> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 September 2023, 19:05:37 UTC
9f89283 Johannes Schindelin 08 September 2023, 12:28:43 UTC completion(switch/checkout): treat --track and -t the same When `git switch --track ` is to be completed, only remote refs are eligible because that is what the `--track` option targets. And when the short-hand `-t` is used instead, the same _should_ happen. Let's make it so. Note that the bug exists both in the completions of `switch` and `completion`, even if it manifests in slightly different ways: While the completion of `git switch -t ` will not even look at remote refs, the completion of `git checkout -t ` will look at both remote _and_ local refs. Both should look only at remote refs. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 September 2023, 16:26:15 UTC
aae8558 René Scharfe 07 September 2023, 20:20:59 UTC grep: reject --no-or Since 3e230fa1b2 (grep: use parseopt, 2009-05-07) git grep has been accepting the option --no-or. It does the same as --or: nothing. That's confusing and unintended. Forbid negating --or. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 September 2023, 20:35:07 UTC
203573b Phillip Wood 06 September 2023, 15:22:51 UTC rebase -i: fix adding failed command to the todo list When rebasing commands are moved from the todo list in "git-rebase-todo" to the "done" file (which is used by "git status" to show the recently executed commands) just before they are executed. This means that if a command fails because it would overwrite an untracked file it has to be added back into the todo list before the rebase stops for the user to fix the problem. Unfortunately when a failed command is added back into the todo list the command preceding it is erroneously appended to the "done" file. This means that when rebase stops after "pick B" fails the "done" file contains pick A pick B pick A instead of pick A pick B This happens because save_todo() updates the "done" file with the previous command whenever "git-rebase-todo" is updated. When we add the failed pick back into "git-rebase-todo" we do not want to update "done". Fix this by adding a "reschedule" parameter to save_todo() which prevents the "done" file from being updated when adding a failed command back into the "git-rebase-todo" file. A couple of the existing tests are modified to improve their coverage as none of them trigger this bug or check the "done" file. Reported-by: Stefan Haller <lists@haller-berlin.de> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 September 2023, 17:29:44 UTC
405509c Phillip Wood 06 September 2023, 15:22:50 UTC rebase --continue: refuse to commit after failed command If a commit cannot be picked because it would overwrite an untracked file then "git rebase --continue" should refuse to commit any staged changes as the commit was not picked. This is implemented by refusing to commit if the message file is missing. The message file is chosen for this check because it is only written when "git rebase" stops for the user to resolve merge conflicts. Existing commands that refuse to commit staged changes when continuing such as a failed "exec" rely on checking for the absence of the author script in run_git_commit(). This prevents the staged changes from being committed but prints error: could not open '.git/rebase-merge/author-script' for reading before the message about not being able to commit. This is confusing to users and so checking for the message file instead improves the user experience. The existing test for refusing to commit after a failed exec is updated to check that we do not print the error message about a missing author script anymore. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 September 2023, 17:29:44 UTC
e032abd Phillip Wood 06 September 2023, 15:22:49 UTC rebase: fix rewritten list for failed pick git rebase keeps a list that maps the OID of each commit before it was rebased to the OID of the equivalent commit after the rebase. This list is used to drive the "post-rewrite" hook that is called at the end of a successful rebase. When a rebase stops for the user to resolve merge conflicts the OID of the commit being picked is written to ".git/rebase-merge/stopped-sha". Then when the rebase is continued that OID is added to the list of rewritten commits. Unfortunately if a commit cannot be picked because it would overwrite an untracked file we still write the "stopped-sha1" file. This means that when the rebase is continued the commit is added into the list of rewritten commits even though it has not been picked yet. Fix this by not calling error_with_patch() for failed commands. The pick has failed so there is nothing to commit and therefore we do not want to set up the state files for committing staged changes when the rebase continues. This change means we no-longer write a patch for the failed command or display the error message printed by error_with_patch(). As the command has failed the patch isn't really useful and in any case the user can inspect the commit associated with the failed command by inspecting REBASE_HEAD. Unless the user has disabled it we already print an advice message that is more helpful than the message from error_with_patch() which the user will still see. Even if the advice is disabled the user will see the messages from the merge machinery detailing the problem. The code to add a failed command back into the todo list is duplicated between pick_one_commit() and the loop in pick_commits(). Both sites print advice about the command being rescheduled, decrement the current item and save the todo list. To avoid duplicating this code pick_one_commit() is modified to set a flag to indicate that the command should be rescheduled in the main loop. This simplifies things as only the remaining copy of the code needs to be modified to set REBASE_HEAD rather than calling error_with_patch(). Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 September 2023, 17:29:43 UTC
f2b5f41 Phillip Wood 06 September 2023, 15:22:48 UTC sequencer: factor out part of pick_commits() This simplifies the next commit. If a pick fails we now return the error at the end of the loop body rather than returning early, a successful "edit" command continues to return early. There are three things to check to ensure that removing the early return for an error does not change the behavior of the code: (1) We could enter the block guarded by "if (reschedule)". This block is not entered because "reschedlue" is always zero when picking a commit. (2) We could enter the block guarded by "else if (is_rebase_i(opts) && check_todo && !res)". This block is not entered when returning an error because "res" is non-zero in that case. (3) todo_list->current could be incremented before returning. That is avoided by moving the increment which is of course a potential change in behavior itself. The move is safe because none of the callers look at todo_list after this function returns. Moving the increment makes it clear we only want to advance the current item if the command was successful. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 September 2023, 17:29:43 UTC
9f67899 Phillip Wood 06 September 2023, 15:22:47 UTC sequencer: use rebase_path_message() Rather than constructing the path in a struct strbuf use the ready made function to get the path name instead. This was the last remaining use of the strbuf so remove it as well. As with the previous patch we now use a hard coded string rather than git_dir() when constructing the path. This is safe for the same reason (make_patch() is only called when rebasing) and is protected by the assertion added in the previous patch. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 September 2023, 17:29:43 UTC
206a78d Phillip Wood 06 September 2023, 15:22:46 UTC rebase -i: remove patch file after conflict resolution When a rebase stops for the user to resolve conflicts it writes a patch for the conflicting commit to .git/rebase-merge/patch. This file has been written since the introduction of "git-rebase-interactive.sh" in 1b1dce4bae7 (Teach rebase an interactive mode, 2007-06-25). I assume the idea was to enable the user inspect the conflicting commit in the same way as they could for the patch based rebase. This file should be deleted when the rebase continues as if the rebase stops for a failed "exec" command or a "break" command it is confusing to the user if there is a stale patch lying around from an unrelated command. As the path is now used in two different places rebase_path_patch() is added and used to obtain the path for the patch. To construct the path write_patch() previously used get_dir() which returns different paths depending on whether we're rebasing or cherry-picking/reverting. As this function is only called when rebasing it is safe to use a hard coded string for the directory instead. An assertion is added to make sure we don't starting calling this function when cherry-picking in the future. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 September 2023, 17:29:43 UTC
36ac861 Phillip Wood 06 September 2023, 15:22:45 UTC rebase -i: move unlink() calls At the start of each iteration the loop that picks commits removes the state files from the previous pick. However some of these files are only written if there are conflicts in which case we exit the loop before the end of the loop body. Therefore they only need to be removed when the rebase continues, not at the start of each iteration. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 September 2023, 17:29:43 UTC
11422f2 Sergey Organov 06 September 2023, 07:15:07 UTC doc/diff-options: fix link to generating patch section When formatted as man-page, the section title is rendered "GENERATING PATCH TEXT WITH -P" whereas reference still reads "Generating patch text with -p", that is inconsistent and makes searching harder than it needs to be. Fix this by getting rid of custom reference text. Also, documentation for every command that describes `-p` option by including the "diff-options.txt" file does include the "diff-generate-patch.txt" file as well (as it should), so the internal link is in fact useful for any of them. Fix this by getting rid of conditionals around the reference. Fixes: ebdc46c242 (docs: link generating patch sections) Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 September 2023, 15:58:45 UTC
256a94e Johannes Schindelin 04 September 2023, 06:21:26 UTC var: avoid a segmentation fault when `HOME` is unset The code introduced in 576a37fccbf (var: add attributes files locations, 2023-06-27) paid careful attention to use `xstrdup()` for pointers known never to be `NULL`, and `xstrdup_or_null()` otherwise. One spot was missed, though: `git_attr_global_file()` can return `NULL`, when the `HOME` variable is not set (and neither `XDG_CONFIG_HOME`), a scenario not too uncommon in certain server scenarios. Fix this, and add a test case to avoid future regressions. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: brian m. carlson <bk2204@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 September 2023, 22:28:26 UTC
back to top