| 3c2a3fd | Junio C Hamano | 23 February 2024, 00:14:53 UTC | Git 2.44 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2024, 00:14:53 UTC |
| 0d464a4 | Junio C Hamano | 23 February 2024, 00:13:38 UTC | Git 2.43.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2024, 00:13:38 UTC |
| 5dc7366 | Junio C Hamano | 23 February 2024, 00:09:45 UTC | Merge branch 'la/trailer-cleanups' into maint-2.43 * la/trailer-cleanups: trailer: fix comment/cut-line regression with opts->no_divider | 23 February 2024, 00:09:45 UTC |
| f41f85c | Junio C Hamano | 20 February 2024, 05:01:01 UTC | Git 2.44-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2024, 05:01:01 UTC |
| 58aa645 | Junio C Hamano | 20 February 2024, 04:58:06 UTC | Merge branch 'la/trailer-cleanups' Fix to an already-graduated topic. * la/trailer-cleanups: trailer: fix comment/cut-line regression with opts->no_divider | 20 February 2024, 04:58:06 UTC |
| bc47139 | Jeff King | 20 February 2024, 01:09:36 UTC | trailer: fix comment/cut-line regression with opts->no_divider Commit 97e9d0b78a (trailer: find the end of the log message, 2023-10-20) combined two code paths for finding the end of the log message. For the "no_divider" case, we used to use find_trailer_end(), and that has now been rolled into find_end_of_log_message(). But there's a regression; that function returns early when no_divider is set, returning the whole string. That's not how find_trailer_end() behaved. Although it did skip the "---" processing (which is what "no_divider" is meant to do), we should still respect ignored_log_message_bytes(), which covers things like comments, "commit -v" cut lines, and so on. The bug is actually in the interpret-trailers command, but the obvious way to experience it is by running "commit -v" with a "--trailer" option. The new trailer will be added at the end of the verbose diff, rather than before it (and consequently will be ignored entirely, since everything after the diff's intro scissors line is thrown away). I've added two tests here: one for interpret-trailers directly, which shows the bug via the parsing routines, and one for "commit -v". The fix itself is pretty simple: instead of returning early, no_divider just skips the "---" handling but still calls ignored_log_message_bytes(). Reported-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2024, 03:06:18 UTC |
| 96c8a07 | Junio C Hamano | 19 February 2024, 16:35:40 UTC | Merge tag 'l10n-2.44.0-rnd3' of https://github.com/git-l10n/git-po l10n-2.44.0-rnd3 * tag 'l10n-2.44.0-rnd3' of https://github.com/git-l10n/git-po: l10n: zh_TW: Git 2.44 l10n: zh_CN: for git 2.44 rounds l10n: Update German translation l10n: tr: Update Turkish translations for 2.44 l10n: fr.po: v2.44.0 round 3 l10n: bg.po: Updated Bulgarian translation (5610t) l10n: sv.po: Update Swedish translation l10n: Update Catalan translation l10n: po-id for 2.44 (round 1) l10n: ci: disable cache for setup-go to suppress warnings l10n: ci: remove unused param for add-pr-comment@v2 l10n: uk: v2.44 update (round 3) l10n: uk: v2.44 update (round 2) l10n: uk: v2.44 localization update l10n: bump Actions versions in l10n.yml | 19 February 2024, 16:35:40 UTC |
| 5fdd5b9 | Yi-Jyun Pan | 18 February 2024, 12:53:27 UTC | l10n: zh_TW: Git 2.44 Co-Authored-By: lumynou5 <lumynou5.tw@gmail.com> Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> | 18 February 2024, 13:03:43 UTC |
| 63e81f2 | Jiang Xin | 18 February 2024, 12:33:01 UTC | Merge branch 'master' of github.com:ralfth/git * 'master' of github.com:ralfth/git: l10n: Update German translation | 18 February 2024, 12:33:01 UTC |
| 9c4289b | Jiang Xin | 18 February 2024, 12:31:55 UTC | Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.44 (round 1) | 18 February 2024, 12:31:55 UTC |
| 3a00233 | Jiang Xin | 18 February 2024, 12:30:05 UTC | Merge branch '2.44-uk-update' of github.com:arkid15r/git-ukrainian-l10n * '2.44-uk-update' of github.com:arkid15r/git-ukrainian-l10n: l10n: uk: v2.44 update (round 3) l10n: uk: v2.44 update (round 2) l10n: uk: v2.44 localization update | 18 February 2024, 12:30:05 UTC |
| ce2f6a0 | Jiang Xin | 18 February 2024, 12:28:57 UTC | Merge branch 'master' of github.com:alshopov/git-po * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5610t) | 18 February 2024, 12:28:57 UTC |
| 499f952 | Jiang Xin | 18 February 2024, 12:27:47 UTC | Merge branch 'tr-l10n' of github.com:bitigchi/git-po * 'tr-l10n' of github.com:bitigchi/git-po: l10n: tr: Update Turkish translations for 2.44 | 18 February 2024, 12:27:47 UTC |
| 45ebe3f | Jiang Xin | 18 February 2024, 12:26:45 UTC | Merge branch 'fr_2.44.0' of github.com:jnavila/git * 'fr_2.44.0' of github.com:jnavila/git: l10n: fr.po: v2.44.0 round 3 | 18 February 2024, 12:26:45 UTC |
| 61ad0f6 | Jiang Xin | 18 February 2024, 12:25:32 UTC | Merge branch 'catalan-l10n' of github.com:Softcatala/git-po * 'catalan-l10n' of github.com:Softcatala/git-po: l10n: Update Catalan translation | 18 February 2024, 12:25:32 UTC |
| 362f27f | Jiang Xin | 18 February 2024, 12:24:48 UTC | Merge branch 'master' of github.com:nafmo/git-l10n-sv * 'master' of github.com:nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation | 18 February 2024, 12:24:48 UTC |
| 3c58354 | Teng Long | 12 February 2024, 13:04:30 UTC | l10n: zh_CN: for git 2.44 rounds In addition to the localized translation in 2.44, for zh_CN, we have uniformly modified the translation of the word "commit-graph" to make it more consistent with language usage habits. Signed-off-by: Teng Long <dyroneteng@gmail.com> | 18 February 2024, 03:48:52 UTC |
| d44a018 | Todd Zullinger | 17 February 2024, 16:37:45 UTC | RelNotes: minor typo fixes in 2.44.0 draft Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2024, 18:11:55 UTC |
| 37c2ad6 | Ralf Thielow | 17 February 2024, 17:14:54 UTC | l10n: Update German translation Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 17 February 2024, 17:14:54 UTC |
| b927408 | Emir SARI | 11 February 2024, 12:39:25 UTC | l10n: tr: Update Turkish translations for 2.44 Signed-off-by: Emir SARI <emir_sari@icloud.com> | 16 February 2024, 19:06:18 UTC |
| 2675562 | Jean-Noël Avila | 11 February 2024, 08:51:46 UTC | l10n: fr.po: v2.44.0 round 3 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 16 February 2024, 18:20:07 UTC |
| 330e419 | Alexander Shopov | 11 February 2024, 13:41:40 UTC | l10n: bg.po: Updated Bulgarian translation (5610t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 16 February 2024, 08:39:04 UTC |
| 20657a8 | Peter Krefting | 16 February 2024, 06:59:21 UTC | l10n: sv.po: Update Swedish translation Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 16 February 2024, 06:59:21 UTC |
| 6f5e31b | Jordi Mas | 11 February 2024, 10:36:02 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 16 February 2024, 06:18:20 UTC |
| c293cf8 | Bagas Sanjaya | 10 February 2024, 13:02:17 UTC | l10n: po-id for 2.44 (round 1) Update following components: * builtin/replay.c * command-list.h * commit-graph.c * pack-bitmap.c * sequencer.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> | 16 February 2024, 04:01:11 UTC |
| 1bb7fcb | Jiang Xin | 16 February 2024, 03:20:39 UTC | l10n: ci: disable cache for setup-go to suppress warnings After we upgraded actions/setup-go to v5, the following warning message was reported every time we ran the CI. Restore cache failed: Dependencies file is not found ... Disable cache to suppress warning messages as described in the solution below. https://github.com/actions/setup-go/issues/427 Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 16 February 2024, 03:51:19 UTC |
| 4d733f0 | Jiang Xin | 16 February 2024, 03:01:04 UTC | l10n: ci: remove unused param for add-pr-comment@v2 When we upgraded GitHub Actions "mshick/add-pr-comment" to v2, the following warning message was reported every time we ran the CI. Unexpected input(s) 'repo-token-user-login', valid inputs ... Removed the obsolete parameter "repo-token-user-login" to suppress warning messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 16 February 2024, 03:40:58 UTC |
| a2e183e | Arkadii Yakovets | 16 February 2024, 02:05:05 UTC | l10n: uk: v2.44 update (round 3) Signed-off-by: Arkadii Yakovets <ark@cho.red> | 16 February 2024, 02:05:05 UTC |
| 6ad5961 | Arkadii Yakovets | 15 February 2024, 04:35:59 UTC | l10n: uk: v2.44 update (round 2) Signed-off-by: Arkadii Yakovets <ark@cho.red> | 16 February 2024, 02:02:14 UTC |
| ed8e89e | Arkadii Yakovets | 13 February 2024, 02:38:26 UTC | l10n: uk: v2.44 localization update Co-authored-by: Kate Golovanova <kate@kgthreads.com> Signed-off-by: Arkadii Yakovets <ark@cho.red> Signed-off-by: Kate Golovanova <kate@kgthreads.com> | 16 February 2024, 02:02:13 UTC |
| c68ee9b | Jiang Xin | 16 February 2024, 01:39:06 UTC | Merge branch 'master' of github.com:git/git * 'master' of github.com:git/git: diff: mark param1 and param2 as placeholders | 16 February 2024, 01:39:06 UTC |
| 3e0d3cd | Junio C Hamano | 15 February 2024, 23:14:48 UTC | Merge branch 'jx/dirstat-parseopt-help' The mark-up of diff options has been updated to help translators. * jx/dirstat-parseopt-help: diff: mark param1 and param2 as placeholders | 15 February 2024, 23:14:48 UTC |
| f98643f | Jiang Xin | 15 February 2024, 01:48:25 UTC | Merge branch 'master' of github.com:git/git * 'master' of github.com:git/git: (51 commits) Hopefully the last batch of fixes before 2.44 final Git 2.43.2 A few more fixes before -rc1 write-or-die: fix the polarity of GIT_FLUSH environment variable A few more topics before -rc1 completion: add and use __git_compute_second_level_config_vars_for_section completion: add and use __git_compute_first_level_config_vars_for_section completion: complete 'submodule.*' config variables completion: add space after config variable names also in Bash 3 receive-pack: use find_commit_header() in check_nonce() ci(linux32): add a note about Actions that must not be updated ci: bump remaining outdated Actions versions unit-tests: do show relative file paths on non-Windows, too receive-pack: use find_commit_header() in check_cert_push_options() prune: mark rebase autostash and orig-head as reachable sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands ref-filter.c: sort formatted dates by byte value ssh signing: signal an error with a negative return value bisect: document command line arguments for "bisect start" bisect: document "terms" subcommand more fully ... | 15 February 2024, 01:48:25 UTC |
| 4fc51f0 | Junio C Hamano | 14 February 2024, 21:49:09 UTC | Hopefully the last batch of fixes before 2.44 final Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2024, 23:36:06 UTC |
| 89400c3 | Junio C Hamano | 14 February 2024, 23:36:06 UTC | Merge branch 'pb/complete-config' The command line completion script (in contrib/) learned to complete configuration variable names better. * pb/complete-config: completion: add and use __git_compute_second_level_config_vars_for_section completion: add and use __git_compute_first_level_config_vars_for_section completion: complete 'submodule.*' config variables completion: add space after config variable names also in Bash 3 | 14 February 2024, 23:36:06 UTC |
| c59ba68 | Junio C Hamano | 14 February 2024, 23:36:06 UTC | Merge branch 'js/check-null-from-read-object-file' The code paths that call repo_read_object_file() have been tightened to react to errors. * js/check-null-from-read-object-file: Always check the return value of `repo_read_object_file()` | 14 February 2024, 23:36:06 UTC |
| e864023 | Junio C Hamano | 14 February 2024, 23:36:05 UTC | Merge branch 'rs/receive-pack-remove-find-header' Code simplification. * rs/receive-pack-remove-find-header: receive-pack: use find_commit_header() in check_nonce() receive-pack: use find_commit_header() in check_cert_push_options() | 14 February 2024, 23:36:05 UTC |
| c036a14 | Junio C Hamano | 14 February 2024, 23:36:05 UTC | Merge branch 'vn/rebase-with-cherry-pick-authorship' "git cherry-pick" invoked during "git rebase -i" session lost the authorship information, which has been corrected. * vn/rebase-with-cherry-pick-authorship: sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands | 14 February 2024, 23:36:05 UTC |
| 09e0aa6 | Junio C Hamano | 14 February 2024, 23:36:05 UTC | Merge branch 'pw/gc-during-rebase' The sequencer machinery does not use the ref API and instead records names of certain objects it needs for its correct operation in temporary files, which makes these objects susceptible to loss by garbage collection. These temporary files have been added as starting points for reachability analysis to fix this. * pw/gc-during-rebase: prune: mark rebase autostash and orig-head as reachable | 14 February 2024, 23:36:05 UTC |
| 5e7013a | Jiang Xin | 14 February 2024, 08:46:41 UTC | diff: mark param1 and param2 as placeholders Some l10n translators translated the parameters "files", "param1" and "param2" in the following message: "synonym for --dirstat=files,param1,param2..." Translating "param1" and "param2" is OK, but changing the parameter "files" is wrong. The parameters that are not meant to be used verbatim should be marked as placeholders, but the verbatim parameter not marked as a placeholder should be left as is. This change is a complement for commit 51e846e673 (doc: enforce placeholders in documentation, 2023-12-25). With the help of Jean-Noël,some parameter combinations in one placeholder (e.g. "<param1,param2>...") are splited into seperate placeholders. Helped-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2024, 17:29:10 UTC |
| edae91a | Junio C Hamano | 13 February 2024, 22:47:02 UTC | Git 2.44-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2024, 23:12:53 UTC |
| efb050b | Junio C Hamano | 13 February 2024, 22:44:20 UTC | Git 2.43.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2024, 22:44:51 UTC |
| dc55772 | Junio C Hamano | 13 February 2024, 22:44:51 UTC | Merge branch 'pb/template-for-single-commit-pr' into maint-2.43 Doc update. * pb/template-for-single-commit-pr: .github/PULL_REQUEST_TEMPLATE.md: add a note about single-commit PRs | 13 February 2024, 22:44:51 UTC |
| 1e73351 | Junio C Hamano | 13 February 2024, 22:44:51 UTC | Merge branch 'jc/bisect-doc' into maint-2.43 Doc update. * jc/bisect-doc: bisect: document command line arguments for "bisect start" bisect: document "terms" subcommand more fully | 13 February 2024, 22:44:51 UTC |
| 8d792dc | Junio C Hamano | 13 February 2024, 22:44:51 UTC | Merge branch 'js/win32-retry-pipe-write-on-enospc' into maint-2.43 Update to the code that writes to pipes on Windows. * js/win32-retry-pipe-write-on-enospc: win32: special-case `ENOSPC` when writing to a pipe | 13 February 2024, 22:44:51 UTC |
| 08b7e46 | Junio C Hamano | 13 February 2024, 22:44:50 UTC | Merge branch 'tb/pack-bitmap-drop-unused-struct-member' into maint-2.43 Code clean-up. * tb/pack-bitmap-drop-unused-struct-member: pack-bitmap: drop unused `reuse_objects` | 13 February 2024, 22:44:51 UTC |
| 8f1c4a7 | Junio C Hamano | 13 February 2024, 22:44:50 UTC | Merge branch 'jt/p4-spell-re-with-raw-string' into maint-2.43 "git p4" update to squelch warnings from Python. * jt/p4-spell-re-with-raw-string: git-p4: use raw string literals for regular expressions | 13 February 2024, 22:44:50 UTC |
| b6fdf92 | Junio C Hamano | 13 February 2024, 22:44:50 UTC | Merge branch 'jc/coc-whitespace-fix' into maint-2.43 Docfix. * jc/coc-whitespace-fix: CoC: whitespace fix | 13 February 2024, 22:44:50 UTC |
| 81e3eea | Junio C Hamano | 13 February 2024, 22:44:50 UTC | Merge branch 'sd/negotiate-trace-fix' into maint-2.43 Tracing fix. * sd/negotiate-trace-fix: push: region_leave trace for negotiate_using_fetch | 13 February 2024, 22:44:50 UTC |
| 05a9617 | Junio C Hamano | 13 February 2024, 22:44:50 UTC | Merge branch 'jc/majordomo-to-subspace' into maint-2.43 Doc update. * jc/majordomo-to-subspace: Docs: majordomo@vger.kernel.org has been decomissioned | 13 February 2024, 22:44:50 UTC |
| f2e7998 | Junio C Hamano | 13 February 2024, 22:44:49 UTC | Merge branch 'nb/rebase-x-shell-docfix' into maint-2.43 Doc update. * nb/rebase-x-shell-docfix: rebase: fix documentation about used shell in -x | 13 February 2024, 22:44:49 UTC |
| 2928250 | Junio C Hamano | 13 February 2024, 22:44:49 UTC | Merge branch 'la/strvec-comment-fix' into maint-2.43 Comment fix. * la/strvec-comment-fix: strvec: use correct member name in comments | 13 February 2024, 22:44:49 UTC |
| 5193aee | Junio C Hamano | 13 February 2024, 22:44:49 UTC | Merge branch 'ne/doc-filter-blob-limit-fix' into maint-2.43 Docfix. * ne/doc-filter-blob-limit-fix: rev-list-options: fix off-by-one in '--filter=blob:limit=<n>' explainer | 13 February 2024, 22:44:49 UTC |
| 7687ca5 | Junio C Hamano | 13 February 2024, 22:44:49 UTC | Merge branch 'cp/git-flush-is-an-env-bool' into maint-2.43 Recent conversion to allow more than 0/1 in GIT_FLUSH broke the mechanism by flipping what yes/no means by mistake, which has been corrected. * cp/git-flush-is-an-env-bool: write-or-die: fix the polarity of GIT_FLUSH environment variable | 13 February 2024, 22:44:49 UTC |
| bd10c45 | Junio C Hamano | 13 February 2024, 22:44:49 UTC | Merge branch 'ps/report-failure-from-git-stash' into maint-2.43 "git stash" sometimes was silent even when it failed due to unwritable index file, which has been corrected. * ps/report-failure-from-git-stash: builtin/stash: report failure to write to index | 13 February 2024, 22:44:49 UTC |
| 07fa383 | Junio C Hamano | 13 February 2024, 22:44:48 UTC | Merge branch 'jc/sign-buffer-failure-propagation-fix' into maint-2.43 A failed "git tag -s" did not necessarily result in an error depending on the crypto backend, which has been corrected. * jc/sign-buffer-failure-propagation-fix: ssh signing: signal an error with a negative return value tag: fix sign_buffer() call to create a signed tag | 13 February 2024, 22:44:48 UTC |
| a1cd814 | Junio C Hamano | 13 February 2024, 22:44:48 UTC | Merge branch 'jc/comment-style-fixes' into maint-2.43 Rewrite //-comments to /* comments */ in files whose comments prevalently use the latter. * jc/comment-style-fixes: reftable/pq_test: comment style fix merge-ort.c: comment style fix builtin/worktree: comment style fixes | 13 February 2024, 22:44:48 UTC |
| 5071cb7 | Junio C Hamano | 13 February 2024, 22:44:48 UTC | Merge branch 'jk/diff-external-with-no-index' into maint-2.43 "git diff --no-index file1 file2" segfaulted while invoking the external diff driver, which has been corrected. * jk/diff-external-with-no-index: diff: handle NULL meta-info when spawning external diff | 13 February 2024, 22:44:48 UTC |
| d982de5 | Junio C Hamano | 13 February 2024, 22:44:48 UTC | Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix' into maint-2.43 "git diff --no-rename A B" did not disable rename detection but did not trigger an error from the command line parser. * rs/parse-options-with-keep-unknown-abbrev-fix: parse-options: simplify positivation handling parse-options: fully disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN | 13 February 2024, 22:44:48 UTC |
| 904ca69 | Junio C Hamano | 13 February 2024, 22:44:47 UTC | Merge branch 'en/diffcore-delta-final-line-fix' into maint-2.43 Rename detection logic ignored the final line of a file if it is an incomplete line. * en/diffcore-delta-final-line-fix: diffcore-delta: avoid ignoring final 'line' of file | 13 February 2024, 22:44:48 UTC |
| 908fde1 | Junio C Hamano | 13 February 2024, 22:44:47 UTC | Merge branch 'tc/show-ref-exists-fix' into maint-2.43 Update to a new feature recently added, "git show-ref --exists". * tc/show-ref-exists-fix: builtin/show-ref: treat directory as non-existing in --exists | 13 February 2024, 22:44:47 UTC |
| 4cde9f0 | Junio C Hamano | 13 February 2024, 22:25:40 UTC | A few more fixes before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2024, 22:31:12 UTC |
| 4abab9e | Junio C Hamano | 13 February 2024, 22:31:12 UTC | Merge branch 'cp/git-flush-is-an-env-bool' Recent conversion to allow more than 0/1 in GIT_FLUSH broke the mechanism by flipping what yes/no means by mistake, which has been corrected. * cp/git-flush-is-an-env-bool: write-or-die: fix the polarity of GIT_FLUSH environment variable | 13 February 2024, 22:31:12 UTC |
| 9115864 | Junio C Hamano | 13 February 2024, 22:31:11 UTC | Merge branch 'jc/unit-tests-make-relative-fix' The mechanism to report the filename in the source code, used by the unit-test machinery, assumed that the compiler expanded __FILE__ to the path to the source given to the $(CC), but some compilers give full path, breaking the output. This has been corrected. * jc/unit-tests-make-relative-fix: unit-tests: do show relative file paths on non-Windows, too | 13 February 2024, 22:31:11 UTC |
| c2914d4 | Junio C Hamano | 13 February 2024, 22:31:11 UTC | Merge branch 'js/github-actions-update' Update remaining GitHub Actions jobs to avoid warnings against using deprecated version of Node.js. * js/github-actions-update: ci(linux32): add a note about Actions that must not be updated ci: bump remaining outdated Actions versions | 13 February 2024, 22:31:11 UTC |
| 133a7b0 | Junio C Hamano | 13 February 2024, 22:31:11 UTC | Merge branch 'jc/github-actions-update' Squelch node.js 16 deprecation warnings from GitHub Actions CI by updating actions/github-script and actions/checkout that use node.js 20. * jc/github-actions-update: GitHub Actions: update to github-script@v7 GitHub Actions: update to checkout@v4 | 13 February 2024, 22:31:11 UTC |
| b40ba17 | Junio C Hamano | 13 February 2024, 19:48:15 UTC | write-or-die: fix the polarity of GIT_FLUSH environment variable When GIT_FLUSH is set to 1, true, on, yes, then we should disable skip_stdout_flush, but the conversion somehow did the opposite. With the understanding of the original motivation behind "skip" in 06f59e9f (Don't fflush(stdout) when it's not helpful, 2007-06-29), we can sympathize with the current naming (we wanted to avoid useless flushing of stdout by default, with an escape hatch to always flush), but it is still not a good excuse. Retire the "skip_stdout_flush" variable and replace it with "flush_stdout" that tells if we do or do not want to run fflush(). Reported-by: Xiaoguang WANG <wxiaoguang@gmail.com> Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2024, 19:57:28 UTC |
| 2996f11 | Junio C Hamano | 12 February 2024, 21:17:06 UTC | Sync with 'maint' | 12 February 2024, 21:17:06 UTC |
| ad1a669 | Junio C Hamano | 12 February 2024, 20:20:35 UTC | A few more topics before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 21:16:12 UTC |
| 3b89ff1 | Junio C Hamano | 12 February 2024, 21:16:11 UTC | Merge branch 'tb/multi-pack-reuse-experiment' Setting `feature.experimental` opts the user into multi-pack reuse experiment * tb/multi-pack-reuse-experiment: pack-objects: enable multi-pack reuse via `feature.experimental` t5332-multi-pack-reuse.sh: extract pack-objects helper functions | 12 February 2024, 21:16:11 UTC |
| d4833b2 | Junio C Hamano | 12 February 2024, 21:16:11 UTC | Merge branch 'vd/for-each-ref-sort-with-formatted-timestamp' "git branch" and friends learned to use the formatted text as sorting key, not the underlying timestamp value, when the --sort option is used with author or committer timestamp with a format specifier (e.g., "--sort=creatordate:format:%H:%M:%S"). * vd/for-each-ref-sort-with-formatted-timestamp: ref-filter.c: sort formatted dates by byte value | 12 February 2024, 21:16:11 UTC |
| b3370dd | Junio C Hamano | 12 February 2024, 21:16:11 UTC | Merge branch 'pw/show-ref-pseudorefs' "git show-ref --verify" did not show things like "CHERRY_PICK_HEAD", which has been corrected. * pw/show-ref-pseudorefs: t1400: use show-ref to check pseudorefs show-ref --verify: accept pseudorefs | 12 February 2024, 21:16:11 UTC |
| 70550a2 | Junio C Hamano | 12 February 2024, 21:16:11 UTC | Merge branch 'ps/report-failure-from-git-stash' "git stash" sometimes was silent even when it failed due to unwritable index file, which has been corrected. * ps/report-failure-from-git-stash: builtin/stash: report failure to write to index | 12 February 2024, 21:16:11 UTC |
| 32c5ab6 | Junio C Hamano | 12 February 2024, 21:16:11 UTC | Merge branch 'pb/template-for-single-commit-pr' Doc update. * pb/template-for-single-commit-pr: .github/PULL_REQUEST_TEMPLATE.md: add a note about single-commit PRs | 12 February 2024, 21:16:11 UTC |
| 05c5a6d | Junio C Hamano | 12 February 2024, 21:16:10 UTC | Merge branch 'jc/sign-buffer-failure-propagation-fix' A failed "git tag -s" did not necessarily result in an error depending on the crypto backend, which has been corrected. * jc/sign-buffer-failure-propagation-fix: ssh signing: signal an error with a negative return value tag: fix sign_buffer() call to create a signed tag | 12 February 2024, 21:16:11 UTC |
| 13fdf82 | Junio C Hamano | 12 February 2024, 21:16:10 UTC | Merge branch 'jc/bisect-doc' Doc update. * jc/bisect-doc: bisect: document command line arguments for "bisect start" bisect: document "terms" subcommand more fully | 12 February 2024, 21:16:10 UTC |
| 4676137 | Junio C Hamano | 12 February 2024, 21:16:10 UTC | Merge branch 'bk/complete-bisect' Command line completion support (in contrib/) has been updated for "git bisect". * bk/complete-bisect: completion: bisect: recognize but do not complete view subcommand completion: bisect: complete log opts for visualize subcommand completion: new function __git_complete_log_opts completion: bisect: complete missing --first-parent and - -no-checkout options completion: bisect: complete custom terms and related options completion: bisect: complete bad, new, old, and help subcommands completion: tests: always use 'master' for default initial branch name | 12 February 2024, 21:16:10 UTC |
| f424d7c | Junio C Hamano | 12 February 2024, 21:16:10 UTC | Merge branch 'ps/reftable-styles' Code clean-up in various reftable code paths. * ps/reftable-styles: reftable/record: improve semantics when initializing records reftable/merged: refactor initialization of iterators reftable/merged: refactor seeking of records reftable/stack: use `size_t` to track stack length reftable/stack: use `size_t` to track stack slices during compaction reftable/stack: index segments with `size_t` reftable/stack: fix parameter validation when compacting range reftable: introduce macros to allocate arrays reftable: introduce macros to grow arrays | 12 February 2024, 21:16:10 UTC |
| cf4a3bd | Junio C Hamano | 12 February 2024, 21:16:09 UTC | Merge branch 'ps/reftable-multi-level-indices-fix' Write multi-level indices for reftable has been corrected. * ps/reftable-multi-level-indices-fix: reftable: document reading and writing indices reftable/writer: fix writing multi-level indices reftable/writer: simplify writing index records reftable/writer: use correct type to iterate through index entries reftable/reader: be more careful about errors in indexed seeks | 12 February 2024, 21:16:10 UTC |
| 7adf215 | Junio C Hamano | 12 February 2024, 17:57:59 UTC | Merge branch 'pb/imap-send-wo-curl-build-fix' into maint-2.43 * pb/imap-send-wo-curl-build-fix: imap-send: add missing "strbuf.h" include under NO_CURL | 12 February 2024, 17:57:59 UTC |
| 6e32f71 | Philippe Blain | 10 February 2024, 18:32:23 UTC | completion: add and use __git_compute_second_level_config_vars_for_section In a previous commit we removed some hardcoded config variable names from function __git_complete_config_variable_name in the completion script by introducing a new function, __git_compute_first_level_config_vars_for_section. The remaining hardcoded config variables are "second level" configuration variables, meaning 'branch.<name>.upstream', 'remote.<name>.url', etc. where <name> is a user-defined name. Making use of the new existing --config flag to 'git help', add a new function, __git_compute_second_level_config_vars_for_section. This function takes as argument a config section name and computes the corresponding second-level config variables, i.e. those that contain a '<' which indicates the start of a placeholder. Note that as in __git_compute_first_level_config_vars_for_section added previsouly, we use indirect expansion instead of associative arrays to stay compatible with Bash 3 on which macOS is stuck for licensing reasons. As explained in the previous commit, we use the existing pattern in the completion script of using global variables to cache the list of variables for each section. Use this new function and the variables it defines in __git_complete_config_variable_name to remove hardcoded config variables, and add a test to verify the new function. Use a single 'case' for all sections with second-level variables names, since the code for each of them is now exactly the same. Adjust the name of a test added in a previous commit to reflect that it now tests the added function. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 17:43:42 UTC |
| 1e0ee40 | Philippe Blain | 10 February 2024, 18:32:22 UTC | completion: add and use __git_compute_first_level_config_vars_for_section The function __git_complete_config_variable_name in the Bash completion script hardcodes several config variable names. These variables are those in config sections where user-defined names can appear, such as "branch.<name>". These sections are treated first by the case statement, and the two last "catch all" cases are used for other sections, making use of the __git_compute_config_vars and __git_compute_config_sections function, which omit listing any variables containing wildcards or placeholders. Having hardcoded config variables introduces the risk of the completion code becoming out of sync with the actual config variables accepted by Git. To avoid these hardcoded config variables, introduce a new function, __git_compute_first_level_config_vars_for_section, making use of the existing __git_config_vars variable. This function takes as argument a config section name and computes the matching "first level" config variables for that section, i.e. those _not_ containing any placeholder, like 'branch.autoSetupMerge, 'remote.pushDefault', etc. Use this function and the variables it defines in the 'branch.*', 'remote.*' and 'submodule.*' switches of the case statement instead of hardcoding the corresponding config variables. Note that we use indirect expansion to create a variable for each section, instead of using a single associative array indexed by section names, because associative arrays are not supported in Bash 3, on which macOS is stuck for licensing reasons. Use the existing pattern in the completion script of using global variables to cache the list of config variables for each section. The rationale for such caching is explained in eaa4e6ee2a (Speed up bash completion loading, 2009-11-17), and the current approach to using and defining them via 'test -n' is explained in cf0ff02a38 (completion: work around zsh option propagation bug, 2012-02-02). Adjust the name of one of the tests added in the previous commit, reflecting that it now also tests the new function. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 17:43:42 UTC |
| b1d0cc6 | Philippe Blain | 10 February 2024, 18:32:21 UTC | completion: complete 'submodule.*' config variables In the Bash completion script, function __git_complete_config_variable_name completes config variables and has special logic to deal with config variables involving user-defined names, like branch.<name>.* and remote.<name>.*. This special logic is missing for submodule-related config variables. Add the appropriate branches to the case statement, making use of the in-tree '.gitmodules' to list relevant submodules. Add corresponding tests in t9902-completion.sh, making sure we complete both first level submodule config variables as well as second level variables involving submodule names. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 17:43:42 UTC |
| 30bd55f | Philippe Blain | 10 February 2024, 18:32:20 UTC | completion: add space after config variable names also in Bash 3 In be6444d1ca (completion: bash: add correct suffix in variables, 2021-08-16), __git_complete_config_variable_name was changed to use "${sfx- }" instead of "$sfx" as the fourth argument of _gitcomp_nl and _gitcomp_nl_append, such that this argument evaluates to a space if sfx is unset. This was to ensure that e.g. git config branch.autoSetupMe[TAB] correctly completes to 'branch.autoSetupMerge ' with the trailing space. This commits notes that the fix only works in Bash 4 because in Bash 3 the 'local sfx' construct at the beginning of __git_complete_config_variable_name creates an empty string. Make the fix also work for Bash 3 by using the "unset or null' parameter expansion syntax ("${sfx:- }"), such that the parameter is also expanded to a space if it is set but null, as is the behaviour of 'local sfx' in Bash 3. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 17:43:41 UTC |
| 020456c | René Scharfe | 09 February 2024, 20:41:47 UTC | receive-pack: use find_commit_header() in check_nonce() Use the public function find_commit_header() and remove find_header(), as it becomes unused. This is safe and appropriate because we pass the NUL-terminated payload buffer to check_nonce() instead of its start and length. The underlying strbuf push_cert cannot contain NULs, as it is built using strbuf_addstr(), only. We no longer need to call strlen(), as find_commit_header() returns the length of nonce already. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 17:22:20 UTC |
| 20e0ff8 | Johannes Schindelin | 11 February 2024, 12:11:29 UTC | ci(linux32): add a note about Actions that must not be updated The Docker container used by the `linux32` job comes without Node.js, and therefore the `actions/checkout` and `actions/upload-artifact` Actions cannot be upgraded to the latest versions (because they use Node.js). One time too many, I accidentally tried to update them, where `actions/checkout` at least fails immediately, but the `actions/upload-artifact` step is only used when any test fails, and therefore the CI run usually passes even though that Action was updated to a version that is incompatible with the Docker container in which this job runs. So let's add a big fat warning, mainly for my own benefit, to avoid running into the very same issue over and over again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 16:48:22 UTC |
| 820a340 | Johannes Schindelin | 11 February 2024, 12:11:28 UTC | ci: bump remaining outdated Actions versions After activating automatic Dependabot updates in the git-for-windows/git repository, Dependabot noticed a couple of yet-unaddressed updates. They avoid "Node.js 16 Actions" deprecation messages by bumping the following Actions' versions: - actions/upload-artifact from 3 to 4 - actions/download-artifact from 3 to 4 - actions/cache from 3 to 4 Helped-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 16:47:38 UTC |
| f662863 | Junio C Hamano | 11 February 2024, 15:58:04 UTC | unit-tests: do show relative file paths on non-Windows, too There are compilers other than Visual C that want to show absolute paths. Generalize the helper introduced by a2c5e294 (unit-tests: do show relative file paths, 2023-09-25) so that it can also work with a path that uses slash as the directory separator, and becomes almost no-op once one-time preparation finds out that we are using a compiler that already gives relative paths. Incidentally, this also should do the right thing on Windows with a compiler that shows relative paths but with backslash as the directory separator (if such a thing exists and is used to build git). Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2024, 16:44:22 UTC |
| 6032aee | Johannes Schindelin | 07 February 2024, 19:42:17 UTC | l10n: bump Actions versions in l10n.yml This avoids the "Node.js 16 Actions are deprecated" warnings. Original-commits-by: dependabot[bot] <support@github.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 11 February 2024, 11:47:51 UTC |
| f51d790 | René Scharfe | 09 February 2024, 20:36:40 UTC | receive-pack: use find_commit_header() in check_cert_push_options() Use the public function find_commit_header() instead of find_header() to simplify the code. This is possible and safe because we're operating on a strbuf, which is always NUL-terminated, so there is no risk of running over the end of the buffer. It cannot contain NUL within the buffer, as it is built using strbuf_addstr(), only. The string comparison becomes more complicated because we need to check for NUL explicitly after comparing the length-limited option, but on the flip side we don't need to clean up allocations or track the remaining buffer length. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2024, 22:03:15 UTC |
| bc7f5db | Phillip Wood | 09 February 2024, 16:19:39 UTC | prune: mark rebase autostash and orig-head as reachable Rebase records the oid of HEAD before rebasing and the commit created by "--autostash" in files in the rebase state directory. This means that the autostash commit is never reachable from any ref or reflog and when rebasing a detached HEAD the original HEAD can become unreachable if the user expires HEAD's the reflog while the rebase is running. Fix this by reading the relevant files when marking reachable commits. Note that it is possible for the commit recorded in .git/rebase-merge/amend to be unreachable but pruning that object does not affect the operation of "git rebase --continue" as we're only interested in the object id, not in the object itself. Reported-by: Orgad Shaneh <orgads@gmail.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2024, 18:04:59 UTC |
| c875e0b | Junio C Hamano | 09 February 2024, 00:35:07 UTC | Git 2.44-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2024, 00:35:07 UTC |
| e0b521c | Junio C Hamano | 09 February 2024, 00:30:22 UTC | Sync with Git 2.43.1 | 09 February 2024, 00:30:54 UTC |
| 3526e67 | Junio C Hamano | 08 February 2024, 23:56:45 UTC | Git 2.43.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2024, 00:22:12 UTC |
| 963eda2 | Junio C Hamano | 09 February 2024, 00:22:12 UTC | Merge branch 'ib/rebase-reschedule-doc' into maint-2.43 Doc update. * ib/rebase-reschedule-doc: rebase: clarify --reschedule-failed-exec default | 09 February 2024, 00:22:12 UTC |
| a064af6 | Junio C Hamano | 09 February 2024, 00:22:12 UTC | Merge branch 'jk/index-pack-lsan-false-positive-fix' into maint-2.43 Fix false positive reported by leak sanitizer. * jk/index-pack-lsan-false-positive-fix: index-pack: spawn threads atomically | 09 February 2024, 00:22:12 UTC |
| 16a830f | Junio C Hamano | 09 February 2024, 00:22:12 UTC | Merge branch 'cp/sideband-array-index-comment-fix' into maint-2.43 In-code comment fix. * cp/sideband-array-index-comment-fix: sideband.c: remove redundant 'NEEDSWORK' tag | 09 February 2024, 00:22:12 UTC |
| d690c8e | Junio C Hamano | 09 February 2024, 00:22:11 UTC | Merge branch 'ms/rebase-insnformat-doc-fix' into maint-2.43 Docfix. * ms/rebase-insnformat-doc-fix: Documentation: fix statement about rebase.instructionFormat | 09 February 2024, 00:22:12 UTC |
| 5b49c1a | Junio C Hamano | 09 February 2024, 00:22:11 UTC | Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43 Sideband demultiplexer fixes. * jx/sideband-chomp-newline-fix: pkt-line: do not chomp newlines for sideband messages pkt-line: memorize sideband fragment in reader test-pkt-line: add option parser for unpack-sideband | 09 February 2024, 00:22:11 UTC |
| fb3ead6 | Junio C Hamano | 09 February 2024, 00:22:11 UTC | Merge branch 'jk/t1006-cat-file-objectsize-disk' into maint-2.43 Test update. * jk/t1006-cat-file-objectsize-disk: t1006: prefer shell loop to awk for packed object sizes t1006: add tests for %(objectsize:disk) | 09 February 2024, 00:22:11 UTC |
