Skip to main content

Browse the archive

https://github.com/git/git
14 July 2024, 01:08:53 UTC
sort by:
Revision Author Date Message Commit Date
e54793a Junio C Hamano 05 May 2022, 21:36:37 UTC Git 2.36.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 May 2022, 21:36:37 UTC
565442c Junio C Hamano 05 May 2022, 21:36:25 UTC Merge branch 'ab/cc-package-fixes' into maint Correct choices of C compilers used in various CI jobs. source: <patch-v3-1.1-8b3444ecc87-20220422T092015Z-avarab@gmail.com> * ab/cc-package-fixes: CI: select CC based on CC_PACKAGE (again) 05 May 2022, 21:36:25 UTC
c038dd6 Junio C Hamano 05 May 2022, 21:36:25 UTC Merge branch 'jc/cocci-xstrdup-or-null-fix' into maint Get rid of a bogus and over-eager coccinelle rule. source: <xmqq1qxd6e4x.fsf@gitster.g> * jc/cocci-xstrdup-or-null-fix: cocci: drop bogus xstrdup_or_null() rule 05 May 2022, 21:36:25 UTC
676cead Junio C Hamano 05 May 2022, 21:36:25 UTC Merge branch 'rs/format-patch-pathspec-fix' into maint "git format-patch <args> -- <pathspec>" lost the pathspec when showing the second and subsequent commits, which has been corrected. source: <c36896a1-6247-123b-4fa3-b7eb24af1897@web.de> * rs/format-patch-pathspec-fix: 2.36 format-patch regression fix 05 May 2022, 21:36:25 UTC
09a2302 Junio C Hamano 05 May 2022, 21:36:25 UTC Merge branch 'rs/fast-export-pathspec-fix' into maint "git fast-export -- <pathspec>" lost the pathspec when showing the second and subsequent commits, which has been corrected. source: <2c988c7b-0efe-4222-4a43-8124fe1a9da6@web.de> * rs/fast-export-pathspec-fix: 2.36 fast-export regression fix 05 May 2022, 21:36:25 UTC
8da1481 Junio C Hamano 05 May 2022, 21:36:24 UTC Merge branch 'jc/show-pathspec-fix' into maint "git show <commit1> <commit2>... -- <pathspec>" lost the pathspec when showing the second and subsequent commits, which has been corrected. source: <xmqqo80j87g0.fsf_-_@gitster.g> * jc/show-pathspec-fix: 2.36 show regression fix 05 May 2022, 21:36:24 UTC
ee12682 Junio C Hamano 05 May 2022, 21:36:24 UTC Merge branch 'rs/name-rev-fix-free-after-use' into maint Regression fix for 2.36 where "git name-rev" started to sometimes reference strings after they are freed. This fixes a regression in 2.36 and is slate to go to 2.36.1 source: <340c8810-d912-7b18-d46e-a9d43f20216a@web.de> * rs/name-rev-fix-free-after-use: Revert "name-rev: release unused name strings" 05 May 2022, 21:36:24 UTC
8e5c46e Junio C Hamano 05 May 2022, 21:36:24 UTC Merge branch 'jc/diff-tree-stdin-fix' into maint "diff-tree --stdin" has been broken for about a year, but 2.36 release broke it even worse by breaking running the command with <pathspec>, which in turn broke "gitk" and got noticed. This has been corrected by aligning its behaviour to that of "log". This fixes a regression in 2.36 and is slate to go to 2.36.1 source: <xmqq7d7bsu2n.fsf@gitster.g> * jc/diff-tree-stdin-fix: 2.36 gitk/diff-tree --stdin regression fix 05 May 2022, 21:36:24 UTC
899df5f Junio C Hamano 05 May 2022, 21:36:24 UTC Merge branch 'gc/submodule-update-part2' into maint "git submodule update" without pathspec should silently skip an uninitialized submodule, but it started to become noisy by mistake. This fixes a regression in 2.36 and is slate to go to 2.36.1 source: <pull.1258.v2.git.git.1650890741430.gitgitgadget@gmail.com> * gc/submodule-update-part2: submodule--helper: fix initialization of warn_if_uninitialized 05 May 2022, 21:36:24 UTC
08bdd3a Junio C Hamano 01 May 2022, 05:00:30 UTC cocci: drop bogus xstrdup_or_null() rule 13092a91 (cocci: refactor common patterns to use xstrdup_or_null(), 2016-10-12) introduced a rule to rewrite this conditional call to xstrdup(E) and an assignment to variable V: - if (E) - V = xstrdup(E); into an unconditional call to xstrdup_or_null(E) and an assignment to variable V: + V = xstrdup_or_null(E); which is utterly bogus. The original code may already have an acceptable value in V and the conditional assignment may be to improve the value already in V with a copy of a better value E when (and only when) E is not NULL. The rewritten construct unconditionally discards the existing value of V and replaces it with a copy of E, even when E is NULL, which changes the meaning of the program. By the way, if it were -if (E && !V) - V = xstrdup(E); +V = xstrdup_or_null(E); it would probably have been correct. But there is no existing code that would have been improved by such a rule, so let's just remove the bogus one without replacing with the more specific one. Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 May 2022, 05:23:11 UTC
d1c2527 René Scharfe 30 April 2022, 14:31:43 UTC 2.36 fast-export regression fix e900d494dc (diff: add an API for deferred freeing, 2021-02-11) added a way to allow reusing diffopts: the no_free bit. 244c27242f (diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec), 2022-02-16) made that mechanism mandatory. git fast-export doesn't set no_free, so path limiting stopped working after the first commit. Set the flag and add a basic test to make sure only changes to the specified files are exported. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 April 2022, 18:50:33 UTC
91f8f7e René Scharfe 30 April 2022, 10:32:44 UTC 2.36 format-patch regression fix e900d494dc (diff: add an API for deferred freeing, 2021-02-11) added a way to allow reusing diffopts: the no_free bit. 244c27242f (diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec), 2022-02-16) made that mechanism mandatory. git format-patch only sets no_free when --output is given, causing it to forget pathspecs after the first commit. Set no_free unconditionally instead. The existing test was unable to detect this breakage because it checks stderr for the absence of a certain string, but format-patch writes to stdout. Also the test was not checking the case of one commit modifying multiple files and a pathspec limiting the diff. Replace it with a more thorough one. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 April 2022, 18:49:59 UTC
5cdb384 Junio C Hamano 30 April 2022, 05:29:51 UTC 2.36 show regression fix This only surfaced as a regression after 2.36 release, but the breakage was already there with us for at least a year. e900d494 (diff: add an API for deferred freeing, 2021-02-11) introduced a mechanism to delay freeing resources held in diff_options struct that need to be kept as long as the struct will be reused to compute diff. "git log -p" was taught to utilize the mechanism but it was done with an incorrect assumption that the underlying helper function, cmd_log_walk(), is called only once, and it is OK to do the freeing at the end of it. Alas, for "git show A B", the function is called once for each commit given, so it is not OK to free the resources until we finish calling it for all the commits given from the command line. During 2.36 release cycle, we started clearing the <pathspec> as part of this freeing, which made the bug a lot more visible. Fix this breakage by tweaking how cmd_log_walk() frees the resources at the end and using a variant of it that does not immediately free the resources to show each commit object from the command line in "git show". Protect the fix with a few new tests. Reported-by: Daniel Li <dan@danielyli.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 April 2022, 05:31:17 UTC
4f1ccef Orgad Shaneh 25 April 2022, 12:45:41 UTC submodule--helper: fix initialization of warn_if_uninitialized The .warn_if_uninitialized member was introduced by 48308681 (git submodule update: have a dedicated helper for cloning, 2016-02-29) to submodule_update_clone struct and initialized to false. When c9911c93 (submodule--helper: teach update_data more options, 2022-03-15) moved it to update_data struct, it started to initialize it to true but this change was not explained in its log message. The member is set to true only when pathspec was given, and is used when a submodule that matched the pathspec is found uninitialized to give diagnostic message. "submodule update" without pathspec is supposed to iterate over all submodules (i.e. without pathspec limitation) and update only the initialized submodules, and finding uninitialized submodules during the iteration is a totally expected and normal thing that should not be warned. [jc: added tests] Signed-off-by: Orgad Shaneh <orgads@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2022, 18:14:10 UTC
f8781bf Junio C Hamano 26 April 2022, 16:11:44 UTC 2.36 gitk/diff-tree --stdin regression fix This only surfaced as a regression after 2.36 release, but the breakage was already there with us for at least a year. The diff_free() call is to be used after we completely finished with a diffopt structure. After "git diff A B" finishes producing output, calling it before process exit is fine. But there are commands that prepares diff_options struct once, compares two sets of paths, releases resources that were used to do the comparison, then reuses the same diff_option struct to go on to compare the next two sets of paths, like "git log -p". After "git log -p" finishes showing a single commit, calling it before it goes on to the next commit is NOT fine. There is a mechanism, the .no_free member in diff_options struct, to help "git log" to avoid calling diff_free() after showing each commit and instead call it just one. When the mechanism was introduced in e900d494 (diff: add an API for deferred freeing, 2021-02-11), however, we forgot to do the same to "diff-tree --stdin", which *is* a moral equivalent to "git log". During 2.36 release cycle, we started clearing the pathspec in diff_free(), so programs like gitk that runs git diff-tree --stdin -- <pathspec> downstream of a pipe, processing one commit after another, started showing irrelevant comparison outside the given <pathspec> from the second commit. The same commit, by forgetting to teach the .no_free mechanism, broke "diff-tree --stdin -I<regexp>" and nobody noticed it for over a year, presumably because it is so seldom used an option. But <pathspec> is a different story. The breakage was very prominently visible and was reported immediately after 2.36 was released. Fix this breakage by mimicking how "git log" utilizes the .no_free member so that "diff-tree --stdin" behaves more similarly to "log". Protect the fix with a few new tests. Reported-by: Matthias Aßhauer <mha1993@live.de> Helped-by: René Scharfe <l.s.r@web.de> Helped-by: Phillip Wood <phillip.wood123@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 April 2022, 16:26:35 UTC
45a14f5 René Scharfe 22 April 2022, 18:44:40 UTC Revert "name-rev: release unused name strings" This reverts commit 2d53975488df195e1431c3f90bfb5b60018d5bf6. 3656f84278 (name-rev: prefer shorter names over following merges, 2021-12-04) broke the assumption of 2d53975488 (name-rev: release unused name strings, 2020-02-04) that a better name for a child is a better name for all of its ancestors as well, because it added a penalty for generation > 0. This leads to strings being free(3)'d that are still needed. 079f970971 (name-rev: sort tip names before applying, 2020-02-05) already reduced the number of free(3) calls for the use case that motivated the original patch (name-rev --all in the Chromium repository) from ca. 44000 to 5, and 3656f84278 eliminated even those few. So this revert won't affect name-rev's performance on that particular repo. Reported-by: Thomas Hurst <tom@hur.st> Helped-by: Elijah Newren <newren@gmail.com> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 April 2022, 16:46:40 UTC
3506cae Ævar Arnfjörð Bjarmason 22 April 2022, 09:20:53 UTC CI: select CC based on CC_PACKAGE (again) Fix a regression in 707d2f2fe86 (CI: use "$runs_on_pool", not "$jobname" to select packages & config, 2021-11-23). In that commit I changed CC=gcc from CC=gcc-9, but on OSX the "gcc" in $PATH points to clang, we need to use gcc-9 instead. Likewise for the linux-gcc job CC=gcc-8 was changed to the implicit CC=gcc, which would select GCC 9.4.0 instead of GCC 8.4.0. Furthermore in 25715419bf4 (CI: don't run "make test" twice in one job, 2021-11-23) when the "linux-TEST-vars" job was split off from "linux-gcc" the "cc_package: gcc-8" line was copied along with it, so its "cc_package" line wasn't working as intended either. As a table, this is what's changed by this commit, i.e. it only affects the linux-gcc, linux-TEST-vars and osx-gcc jobs: |-------------------+-----------+-------------------+-------+-------| | jobname | vector.cc | vector.cc_package | old | new | |-------------------+-----------+-------------------+-------+-------| | linux-clang | clang | - | clang | clang | | linux-sha256 | clang | - | clang | clang | | linux-gcc | gcc | gcc-8 | gcc | gcc-8 | | osx-clang | clang | - | clang | clang | | osx-gcc | gcc | gcc-9 | clang | gcc-9 | | linux-gcc-default | gcc | - | gcc | gcc | | linux-TEST-vars | gcc | gcc-8 | gcc | gcc-8 | |-------------------+-----------+-------------------+-------+-------| Reported-by: Carlo Arenas <carenas@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 April 2022, 18:28:17 UTC
6cd33dc Junio C Hamano 18 April 2022, 05:21:51 UTC Git 2.36 Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 April 2022, 05:21:51 UTC
b908065 Junio C Hamano 18 April 2022, 05:20:49 UTC Merge tag 'l10n-2.36.0-rnd2.1' of https://github.com/git-l10n/git-po l10n-2.36.0-rnd2.1 * tag 'l10n-2.36.0-rnd2.1' of https://github.com/git-l10n/git-po: l10n: sv.po: Update Swedish translation (5282t0f0u) l10n: Update Catalan translation l10n: po-id for 2.36 (round 2) l10n: de.po: Update German translation l10n: zh_CN v2.36.0 round 2 l10n: pt_PT: update Portuguese translation l10n: vi(5285t): v2.36.0 round 2 l10n: zh_TW: v2.36.0 round 2 l10n: fr: v2.36 round 2 l10n: tr: v2.36.0 round 2 l10n: git.pot: v2.36.0 round 2 (4 new, 3 removed) l10n: fr: v2.36 round 1 l10n: zh_CN v2.36.0 round 1 l10n: Update zh_CN repo link l10n: po-id for 2.36 (round 1) l10n: tr: v2.36.0 round 1 l10n: git.pot: v2.36.0 round 1 (192 new, 106 removed) l10n: pt_PT: update TEAMS file l10n: pt_PT: update Portuguese translation 18 April 2022, 05:20:49 UTC
db4361b Junio C Hamano 17 April 2022, 23:32:05 UTC Merge branch 'cb/buggy-gcc-12-workaround' A couple of work around for CI breaking warnings from gcc 12. * cb/buggy-gcc-12-workaround: config.mak.dev: alternative workaround to gcc 12 warning in http.c config.mak.dev: workaround gcc 12 bug affecting "pedantic" CI job 17 April 2022, 23:32:05 UTC
9b23d2c Peter Krefting 17 April 2022, 17:13:34 UTC l10n: sv.po: Update Swedish translation (5282t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 17 April 2022, 17:13:34 UTC
1208041 Jiang Xin 17 April 2022, 01:07:28 UTC Merge branch 'master' of github.com:Softcatala/git-po * 'master' of github.com:Softcatala/git-po: l10n: Update Catalan translation 17 April 2022, 01:07:28 UTC
ac87f96 Jordi Mas 16 April 2022, 18:17:17 UTC l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> 16 April 2022, 18:17:17 UTC
aac04e0 Bagas Sanjaya 14 April 2022, 06:40:35 UTC l10n: po-id for 2.36 (round 2) Translate following new components: * setup.c * split-index.c * strbuf.c * trailer.c Also delete obsolete strings. Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 16 April 2022, 10:04:26 UTC
9c539d1 Carlo Marcelo Arenas Belón 15 April 2022, 23:13:42 UTC config.mak.dev: alternative workaround to gcc 12 warning in http.c This provides a "no code change needed" option to the "fix" currently queued as part of ab/http-gcc-12-workaround and therefore should be reverted once that gets merged. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2022, 23:27:04 UTC
846a29a Carlo Marcelo Arenas Belón 15 April 2022, 23:13:41 UTC config.mak.dev: workaround gcc 12 bug affecting "pedantic" CI job Originally noticed by Peff[1], but yet to be corrected[2] and planned to be released with Fedora 36 (scheduled for Apr 19). dir.c: In function ‘git_url_basename’: dir.c:3085:13: error: ‘memchr’ specified bound [9223372036854775808, 0] exceeds maximum object size 9223372036854775807 [-Werror=stringop-overread] 3085 | if (memchr(start, '/', end - start) == NULL | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fedora is used as part of the CI, and therefore that release will trigger failures, unless the version of the image used is locked to an older release, as an alternative. Restricting the flag to the affected source file, as well as implementing an independent facility to track these workarounds was specifically punted to minimize the risk of introducing problems so close to a release. This change should be reverted once the underlying gcc bug is solved and which should be visible by NOT triggering a warning, otherwise. [1] https://lore.kernel.org/git/YZQhLh2BU5Hquhpo@coredump.intra.peff.net/ [2] https://bugzilla.redhat.com/show_bug.cgi?id=2075786 Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 April 2022, 23:26:16 UTC
c616d18 Jiang Xin 15 April 2022, 00:26:53 UTC Merge branch 'master' of github.com:ruester/git-po-de * 'master' of github.com:ruester/git-po-de: l10n: de.po: Update German translation 15 April 2022, 00:26:53 UTC
cb6da32 Jiang Xin 15 April 2022, 00:26:06 UTC Merge branch 'fz/po-2.36.0-round2' of github.com:fangyi-zhou/git-po * 'fz/po-2.36.0-round2' of github.com:fangyi-zhou/git-po: l10n: zh_CN v2.36.0 round 2 15 April 2022, 00:26:06 UTC
4027e30 Junio C Hamano 14 April 2022, 21:17:12 UTC Merge branch 'jc/revert-ref-transaction-hook-changes' Revert the "deletion of a ref should not trigger transaction events for loose and packed ref backends separately" that regresses the behaviour when a ref is not modified since it was packed. * jc/revert-ref-transaction-hook-changes: RelNotes: revert the description on the reverted topics Revert "fetch: increase test coverage of fetches" Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'" 14 April 2022, 21:17:12 UTC
b32632c Junio C Hamano 14 April 2022, 21:17:12 UTC Merge branch 'jc/relnotes-updates' Wording updates for 2.36 release notes. * jc/relnotes-updates: RelNotes: mention safe.directory RelNotes: clarify "bisect run unexecutable" tweak 14 April 2022, 21:17:12 UTC
4ac22f8 Matthias Rüster 09 April 2022, 15:57:47 UTC l10n: de.po: Update German translation Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com> Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> 14 April 2022, 15:03:02 UTC
40f3541 Fangyi Zhou 14 April 2022, 14:46:21 UTC l10n: zh_CN v2.36.0 round 2 Signed-off-by: Fangyi Zhou <me@fangyi.io> 14 April 2022, 14:49:18 UTC
b3717a8 Daniel Santos 23 February 2022, 19:39:47 UTC l10n: pt_PT: update Portuguese translation * update the following words translations: commit, untracked, stage, cache, stash, work..., index, reset, label, check..., tags, graft, alternate object, amend, ancestor, cherry-pick, bisect, blame, chain, cache, bug, chunk, branch, bundle, clean, clone, commit-graph, commit object, commit-ish, committer, cover letter, conflict, dangling, detach, dir, dumb, fast-forward, file system, fixup, fork, fetch, Git archive, gitdir, graft, replace ref * correct some mispellings * git-po-helper update * remove some obsolete lines * unfuzzy entries * random translation updates * update contact in pt_PT.po * add the following words to the translation table: override, recurse, print, offset, unbundle, mirror repository, multi-pack, bad, whitespace, batch * remove the following words of the translation table: core Git * change the following words on the translation table: dry-run, apply, patch, replay, blame, chain, gitdir, file system, fork, unset, handle * some translation to the first person * update copyright text * word 'utilização:' to 'uso:' * word 'pai' to 'parente' Signed-off-by: Daniel Santos <dacs.git@brilhante.top> 14 April 2022, 11:09:07 UTC
2a7f398 Tran Ngoc Quan 14 April 2022, 06:58:46 UTC l10n: vi(5285t): v2.36.0 round 2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> 14 April 2022, 08:34:48 UTC
dd6cf19 Jiang Xin 14 April 2022, 05:13:38 UTC Merge branch 'loc/tw/0407' of github.com:l10n-tw/git-po * 'loc/tw/0407' of github.com:l10n-tw/git-po: l10n: zh_TW: v2.36.0 round 2 14 April 2022, 05:13:38 UTC
c9f01d5 Yi-Jyun Pan 07 April 2022, 06:30:49 UTC l10n: zh_TW: v2.36.0 round 2 Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> 14 April 2022, 00:07:08 UTC
4315986 Junio C Hamano 13 April 2022, 23:55:36 UTC RelNotes: revert the description on the reverted topics Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 23:55:36 UTC
255ede9 Junio C Hamano 13 April 2022, 23:51:41 UTC RelNotes: mention safe.directory Helped-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 23:51:41 UTC
26ff9be Junio C Hamano 13 April 2022, 23:42:33 UTC RelNotes: clarify "bisect run unexecutable" tweak We do not have to guess how common the mistake the change targets is when describing it. Such an argument may be good while proposing a change, but does not quite belong in the record of what has already happened, i.e. a release note. Helped-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 23:42:33 UTC
347cc1b Junio C Hamano 13 April 2022, 22:58:04 UTC Revert "fetch: increase test coverage of fetches" This reverts commit 2a0cafd464709cfa22fe7249290c644a2a26c520, as it expects a working "a ref deletion must produce a single transaction, not one for loose and another for packed" topic, which we do not have. 13 April 2022, 22:58:04 UTC
c6da34a Junio C Hamano 13 April 2022, 22:51:33 UTC Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'" This reverts commit 991b4d47f0accd3955d05927d5ce434e03ffbdb6, reversing changes made to bcd020f88e1e22f38422ac3f73ab06b34ec4bef1. 13 April 2022, 22:51:33 UTC
1ac7422 Junio C Hamano 13 April 2022, 22:26:32 UTC Sync with Git 2.35.3 13 April 2022, 22:26:32 UTC
d516b2d Junio C Hamano 13 April 2022, 22:21:34 UTC Git 2.35.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 22:21:34 UTC
2f0dde7 Junio C Hamano 13 April 2022, 22:21:31 UTC Git 2.34.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 22:21:31 UTC
1f65dd6 Junio C Hamano 13 April 2022, 22:21:28 UTC Git 2.33.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 22:21:28 UTC
1530434 Junio C Hamano 13 April 2022, 22:21:26 UTC Git 2.32.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 22:21:26 UTC
09f66d6 Junio C Hamano 13 April 2022, 22:21:08 UTC Git 2.31.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 22:21:08 UTC
17083c7 Junio C Hamano 13 April 2022, 20:31:29 UTC Git 2.30.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 20:31:29 UTC
0f85c4a Derrick Stolee 13 April 2022, 15:32:31 UTC setup: opt-out of check with safe.directory=* With the addition of the safe.directory in 8959555ce (setup_git_directory(): add an owner check for the top-level directory, 2022-03-02) released in v2.35.2, we are receiving feedback from a variety of users about the feature. Some users have a very large list of shared repositories and find it cumbersome to add this config for every one of them. In a more difficult case, certain workflows involve running Git commands within containers. The container boundary prevents any global or system config from communicating `safe.directory` values from the host into the container. Further, the container almost always runs as a different user than the owner of the directory in the host. To simplify the reactions necessary for these users, extend the definition of the safe.directory config value to include a possible '*' value. This value implies that all directories are safe, providing a single setting to opt-out of this protection. Note that an empty assignment of safe.directory clears all previous values, and this is already the case with the "if (!value || !*value)" condition. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 19:42:51 UTC
bb50ec3 Matheus Valadares 13 April 2022, 15:32:30 UTC setup: fix safe.directory key not being checked It seems that nothing is ever checking to make sure the safe directories in the configs actually have the key safe.directory, so some unrelated config that has a value with a certain directory would also make it a safe directory. Signed-off-by: Matheus Valadares <me@m28.io> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 19:42:51 UTC
e47363e Derrick Stolee 13 April 2022, 15:32:29 UTC t0033: add tests for safe.directory It is difficult to change the ownership on a directory in our test suite, so insert a new GIT_TEST_ASSUME_DIFFERENT_OWNER environment variable to trick Git into thinking we are in a differently-owned directory. This allows us to test that the config is parsed correctly. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2022, 19:42:49 UTC
cdfc63f Jean-Noël Avila 13 April 2022, 19:21:48 UTC l10n: fr: v2.36 round 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 13 April 2022, 19:21:48 UTC
783c5f4 Emir SARI 13 April 2022, 10:28:58 UTC l10n: tr: v2.36.0 round 2 Signed-off-by: Emir SARI <emir_sari@icloud.com> 13 April 2022, 10:35:48 UTC
2731109 Jiang Xin 13 April 2022, 06:55:25 UTC l10n: git.pot: v2.36.0 round 2 (4 new, 3 removed) Generate po/git.pot from v2.36.0-rc2 for git v2.36.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 13 April 2022, 06:55:25 UTC
61de00a Jiang Xin 13 April 2022, 06:51:53 UTC Merge branch 'master' of github.com:git/git * 'master' of github.com:git/git: (25 commits) Git 2.36-rc2 i18n: fix some badly formatted i18n strings Git 2.36-rc1 t9902: split test to run on appropriate systems ls-tree doc: document interaction with submodules Documentation: add --batch-command to cat-file synopsis git-ls-tree.txt: fix the name of "%(objectsize:padded)" submodule-helper: fix usage string doc: replace "--" with {litdd} in credential-cache/fsmonitor contrib/scalar: fix 'all' target in Makefile Documentation/Makefile: fix "make info" regression in dad9cd7d518 configure.ac: fix HAVE_SYNC_FILE_RANGE definition git-compat-util: really support openssl as a source of entropy ls-tree: `-l` should not imply recursive listing Git 2.35.2 Git 2.34.2 Git 2.33.2 Git 2.32.1 Git 2.31.2 Git 2.30.3 ... 13 April 2022, 06:51:53 UTC
11cfe55 Junio C Hamano 12 April 2022, 04:27:02 UTC Git 2.36-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 April 2022, 04:27:02 UTC
3315994 Junio C Hamano 11 April 2022, 23:45:17 UTC Merge branch 'ja/i18n-fix-for-2.36' Fixes to some localizable strings. * ja/i18n-fix-for-2.36: i18n: fix some badly formatted i18n strings 11 April 2022, 23:45:17 UTC
f1b50ec Junio C Hamano 11 April 2022, 23:44:45 UTC Merge tag 'v2.35.2' 11 April 2022, 23:44:45 UTC
af15f84 Jean-Noël Avila 11 April 2022, 19:23:30 UTC i18n: fix some badly formatted i18n strings String in submodule--helper is not correctly formatting placeholders. The string in git-send-email is partial. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 April 2022, 21:13:46 UTC
dfbdf52 Jiang Xin 11 April 2022, 00:48:13 UTC Merge branch 'fr_2.36_rnd1' of github.com:jnavila/git * 'fr_2.36_rnd1' of github.com:jnavila/git: l10n: fr: v2.36 round 1 11 April 2022, 00:48:13 UTC
6e0a358 Jiang Xin 11 April 2022, 00:47:13 UTC Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po * 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh_CN v2.36.0 round 1 l10n: Update zh_CN repo link 11 April 2022, 00:47:13 UTC
48fd053 Jean-Noël Avila 09 April 2022, 16:53:27 UTC l10n: fr: v2.36 round 1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 09 April 2022, 16:53:27 UTC
ab1f276 Junio C Hamano 08 April 2022, 20:54:49 UTC Git 2.36-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 April 2022, 20:54:49 UTC
e7109d5 Junio C Hamano 08 April 2022, 20:53:48 UTC Merge branch 'ld/sparse-index-bash-completion' Test regression fix. * ld/sparse-index-bash-completion: t9902: split test to run on appropriate systems 08 April 2022, 20:53:48 UTC
c42977a Junio C Hamano 08 April 2022, 20:53:48 UTC Merge branch 'tl/ls-tree-oid-only' Docfix. * tl/ls-tree-oid-only: ls-tree doc: document interaction with submodules 08 April 2022, 20:53:48 UTC
6d340df Adam Dinwoodie 08 April 2022, 09:53:53 UTC t9902: split test to run on appropriate systems The "FUNNYNAMES" test prerequisite passes on Cygwin, as the Cygwin file system interface has a workaround for the underlying operating system's lack of support for tabs, newlines or quotes. However, it does not add support for backslash, which is treated as a directory separator, meaning one of the tests added by 48803821b1 ("completion: handle unusual characters for sparse-checkout", 2022-02-07) will fail on Cygwin. To avoid this failure while still getting maximal test coverage, split that test into two: test handling of paths that include tabs on anything that has the FUNNYNAMES prerequisite, but skip testing handling of paths that include backslashes unless both FUNNYNAMES is set and the system is not Cygwin. It might be nice to have more granularity than "FUNNYNAMES" and its sibling "FUNNIERNAMES" provide, so that tests could be run based on specific individual characters supported by the file system being tested, but that seems like it would make the prerequisite checks in this area much more verbose for very little gain. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 April 2022, 19:56:31 UTC
acd34fd Ævar Arnfjörð Bjarmason 08 April 2022, 16:00:25 UTC ls-tree doc: document interaction with submodules The ls-tree documentation had never been updated after it learned to interact with submodules to explicitly mention them. The initial support was added in f35a6d3bce7 (Teach core object handling functions about gitlinks, 2007-04-09). E.g. the discussion of --long added in f35a6d3bce7 (Teach core object handling functions about gitlinks, 2007-04-09) didn't explicitly mention them. But this documentation added in 455923e0a15 (ls-tree: introduce "--format" option, 2022-03-23) had no such excuse, and was actively misleading by providing an exhaustive but incomplete list of object types we'd emit. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 April 2022, 18:21:11 UTC
00e5af3 Fangyi Zhou 06 April 2022, 09:39:20 UTC l10n: zh_CN v2.36.0 round 1 Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io> 08 April 2022, 10:30:59 UTC
ca355e3 Fangyi Zhou 06 April 2022, 09:41:07 UTC l10n: Update zh_CN repo link Signed-off-by: Fangyi Zhou <me@fangyi.io> 08 April 2022, 10:30:59 UTC
bf23fe5 Junio C Hamano 07 April 2022, 22:04:19 UTC Merge branch 'jc/cat-file-batch-commands' Doc fix. * jc/cat-file-batch-commands: Documentation: add --batch-command to cat-file synopsis 07 April 2022, 22:04:19 UTC
473fa2d Ævar Arnfjörð Bjarmason 07 April 2022, 19:08:59 UTC Documentation: add --batch-command to cat-file synopsis 440c705ea63 (cat-file: add --batch-command mode, 2022-02-18) added the new option and operating mode without listing it to the synopsis section. Fix it. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 April 2022, 20:31:54 UTC
07135d6 Junio C Hamano 07 April 2022, 19:23:47 UTC Merge branch 'tz/doc-litdd-fixes' Documentation markup fix. * tz/doc-litdd-fixes: doc: replace "--" with {litdd} in credential-cache/fsmonitor 07 April 2022, 19:23:47 UTC
b2a7c2c Junio C Hamano 07 April 2022, 19:23:31 UTC Merge branch 'js/apply-partial-clone-filters-recursively' Typofix * js/apply-partial-clone-filters-recursively: submodule-helper: fix usage string 07 April 2022, 19:23:31 UTC
77da6db Junio C Hamano 07 April 2022, 19:23:23 UTC Merge branch 'tl/ls-tree-oid-only' * tl/ls-tree-oid-only: git-ls-tree.txt: fix the name of "%(objectsize:padded)" 07 April 2022, 19:23:23 UTC
5e65dac Martin Ågren 07 April 2022, 15:52:31 UTC git-ls-tree.txt: fix the name of "%(objectsize:padded)" Commit 455923e0a1 ("ls-tree: introduce "--format" option", 2022-03-23) introduced `--format` and the various placeholders it can take, such as %(objectname) and %(objectsize). At some point when that patch was being developed, those placeholders had shorter names, e.g., %(name) and %(size), which can be seen in the commit message of 455923e0a1. One instance of "%(size:padded)" also managed to enter the documentation in the final version of the patch. Correct it to "%(objectsize:padded)". Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 April 2022, 17:11:20 UTC
5da9560 Fangyi Zhou 06 April 2022, 20:32:57 UTC submodule-helper: fix usage string The missing space at the end of the line makes the closing square bracket sticking to the dash in the next line Found during localisation v2.36.0 round 1 Signed-off-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 April 2022, 14:46:23 UTC
22ac488 Bagas Sanjaya 09 March 2022, 08:00:50 UTC l10n: po-id for 2.36 (round 1) Update following components: * add-interactive.c * branch.c * config.c * help.c * merge-ort-wrappers.c * builtin/bisect--helper.c * builtin/branch.c * builtin/cat-file.c * builtin/checkout.c * builtin/clone.c * builtin/config.c * builtin/reflog.c * builtin/remote.c * builtin/sparse-checkout.c * builtin/submodule--helper.c * builtin/unpack-objects.c Translate following new components: * connect.c * connected.c * date.c * hook.c * files-backend.c * ident.c * merge-ort.c * merge-recursive.c * refs.c * refspec.c * revision.c * symlinks.c * worktree.c * builtin/notes.c * builtin/multi-pack-index.c * builtin/commit.c * builtin/merge-base.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> 07 April 2022, 07:42:54 UTC
f3ea4be Todd Zullinger 06 April 2022, 18:41:22 UTC doc: replace "--" with {litdd} in credential-cache/fsmonitor Asciidoc renders `--` as em-dash. This is not appropriate for command names. It also breaks linkgit links to these commands. Fix git-credential-cache--daemon and git-fsmonitor--daemon. The latter was added 3248486920 (fsmonitor: document builtin fsmonitor, 2022-03-25) and included several links. A check for broken links in the HTML docs turned this up. Manually inspecting the other Documentation/git-*--*.txt files turned up the issue in git-credential-cache--daemon. While here, quote `git credential-cache--daemon` in the synopsis to match the vast majority of our other documentation. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 April 2022, 23:06:06 UTC
07330a4 Junio C Hamano 06 April 2022, 22:21:59 UTC Merge branch 'tl/ls-tree-oid-only' "git ls-tree" learns "--oid-only" option, similar to "--name-only", and more generalized "--format" option. source: <cover.1648026472.git.dyroneteng@gmail.com> * tl/ls-tree-oid-only: ls-tree: `-l` should not imply recursive listing 06 April 2022, 22:21:59 UTC
95acb13 Junio C Hamano 06 April 2022, 22:21:58 UTC Merge branch 'bc/csprng-mktemps' Build fix. * bc/csprng-mktemps: git-compat-util: really support openssl as a source of entropy 06 April 2022, 22:21:59 UTC
327933f Junio C Hamano 06 April 2022, 22:21:58 UTC Merge branch 'ns/core-fsyncmethod' A couple of fix-up to a topic that is now in 'master'. source: <pull.1193.git.1648663716891.gitgitgadget@gmail.com> * ns/core-fsyncmethod: configure.ac: fix HAVE_SYNC_FILE_RANGE definition 06 April 2022, 22:21:58 UTC
0f0303a Junio C Hamano 06 April 2022, 22:21:58 UTC Merge branch 'ab/make-optim-noop' A micro fix to a topic earlier merged to 'master' source: <patch-1.1-05949221e3f-20220319T002715Z-avarab@gmail.com> * ab/make-optim-noop: contrib/scalar: fix 'all' target in Makefile Documentation/Makefile: fix "make info" regression in dad9cd7d518 06 April 2022, 22:21:58 UTC
f2a2876 Victoria Dye 05 April 2022, 22:35:36 UTC contrib/scalar: fix 'all' target in Makefile Add extra ':' to second 'all' target definition to allow 'scalar' to build. Without this fix, the 'all:' and 'all::' targets together cause a build failure when 'scalar' build is enabled with 'INCLUDE_SCALAR': Makefile:14: *** target file `all' has both : and :: entries. Stop. Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 April 2022, 17:19:57 UTC
8af0699 Ævar Arnfjörð Bjarmason 05 April 2022, 19:56:20 UTC Documentation/Makefile: fix "make info" regression in dad9cd7d518 Fix a regression in my dad9cd7d518 (Makefile: move ".SUFFIXES" rule to shared.mak, 2022-03-03). As explained in the GNU make documentation for the $* variable, available at: info make --index-search='$*' This rule relied on ".texi" being in the default list of suffixes, as seen at: make -f/dev/null -p | grep -v -e ^# -e ^$|grep -F .SUFFIXES The documentation explains what was going on here: In an explicit rule, there is no stem; so '$*' cannot be determined in that way. Instead, if the target name ends with a recognized suffix (*note Old-Fashioned Suffix Rules: Suffix Rules.), '$*' is set to the target name minus the suffix. For example, if the target name is 'foo.c', then '$*' is set to 'foo', since '.c' is a suffix. GNU 'make' does this bizarre thing only for compatibility with other implementations of 'make'. You should generally avoid using '$*' except in implicit rules or static pattern rules. If the target name in an explicit rule does not end with a recognized suffix, '$*' is set to the empty string for that rule. I.e. this rule added back in 5cefc33bffd (Documentation: add gitman.info target, 2007-12-10) was resolving gitman.texi from gitman.info. We can instead just use the more obvious $< variable referring to the prerequisite. This was the only use of $* in our Makefiles in an explicit rule, the three remaining ones are all implicit rules, and therefore didn't depend on the ".SUFFIXES" list. Reported-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Tested-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 April 2022, 16:43:48 UTC
2e37594 Adam Dinwoodie 05 April 2022, 10:00:20 UTC configure.ac: fix HAVE_SYNC_FILE_RANGE definition If sync_file_range is not available when building the configure script, there is a cosmetic bug when running that script reporting "HAVE_SYNC_FILE_RANGE: command not found". Remove that error message by defining HAVE_SYNC_FILE_RANGE to an empty string, rather than generating a script where that appears as a bare command. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 April 2022, 16:36:19 UTC
5b52d9f Carlo Marcelo Arenas Belón 05 April 2022, 04:28:26 UTC git-compat-util: really support openssl as a source of entropy 05cd988dce5 (wrapper: add a helper to generate numbers from a CSPRNG, 2022-01-17), configure openssl as the source for entropy in NON-STOP but doesn't add the needed header or link options. Since the only system that is configured to use openssl as a source of entropy is NON-STOP, add the header unconditionally, and -lcrypto to the list of external libraries. An additional change is required to make sure a NO_OPENSSL=1 build will be able to work as well (tested on Linux with a modified value of CSPRNG_METHOD = openssl), and the more complex logic that allows for compatibility with APPLE_COMMON_CRYPTO or allowing for simpler ways to link (without libssl) has been punted for now. Reported-by: Randall Becker <rsbecker@nexbridge.com> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 April 2022, 16:04:50 UTC
350296c Josh Steadmon 04 April 2022, 22:42:24 UTC ls-tree: `-l` should not imply recursive listing In 9c4d58ff2c (ls-tree: split up "fast path" callbacks, 2022-03-23), a refactoring of the various read_tree_at() callbacks caused us to unconditionally recurse into directories if `-l` (long format) was passed on the command line, regardless of whether or not we also pass the `-r` (recursive) flag. Fix this by making show_tree_long() return the value of `recurse`, rather than always returning 1. This value is interpreted by read_tree_at() to be a signal on whether or not to recurse. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 April 2022, 15:41:25 UTC
3117f0f Emir SARI 06 April 2022, 09:49:32 UTC l10n: tr: v2.36.0 round 1 Signed-off-by: Emir SARI <emir_sari@icloud.com> 06 April 2022, 11:54:31 UTC
6659321 Jiang Xin 06 April 2022, 06:35:30 UTC l10n: git.pot: v2.36.0 round 1 (192 new, 106 removed) Generate po/git.pot from v2.36.0-rc0 for git v2.36.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 06 April 2022, 06:41:16 UTC
6b49afd Jiang Xin 06 April 2022, 06:39:54 UTC Merge branch 'master' of github.com:git-l10n/git-po * 'master' of github.com:git-l10n/git-po: l10n: pt_PT: update TEAMS file l10n: pt_PT: update Portuguese translation 06 April 2022, 06:39:54 UTC
faa21c1 Junio C Hamano 04 April 2022, 17:24:07 UTC Git 2.36-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 April 2022, 17:56:25 UTC
7c6d8ee Junio C Hamano 04 April 2022, 17:56:25 UTC Merge branch 'pw/worktree-list-with-z' "git worktree list --porcelain" did not c-quote pathnames and lock reasons with unsafe bytes correctly, which is worked around by introducing NUL terminated output format with "-z". * pw/worktree-list-with-z: worktree: add -z option for list subcommand 04 April 2022, 17:56:25 UTC
77ceb11 Junio C Hamano 04 April 2022, 17:56:24 UTC Merge branch 'jc/coding-guidelines-decl-in-for-loop' Coding Guidelines clarification. * jc/coding-guidelines-decl-in-for-loop: CodingGuidelines: give deadline for "for (int i = 0; ..." 04 April 2022, 17:56:24 UTC
909d5b6 Junio C Hamano 04 April 2022, 17:56:24 UTC Merge branch 'vd/mv-refresh-stat' "git mv" failed to refresh the cached stat information for the entry it moved. * vd/mv-refresh-stat: mv: refresh stat info for moved entry 04 April 2022, 17:56:24 UTC
439c1e6 Junio C Hamano 04 April 2022, 17:56:24 UTC Merge branch 'jh/builtin-fsmonitor-part2' Built-in fsmonitor (part 2). * jh/builtin-fsmonitor-part2: (30 commits) t7527: test status with untracked-cache and fsmonitor--daemon fsmonitor: force update index after large responses fsmonitor--daemon: use a cookie file to sync with file system fsmonitor--daemon: periodically truncate list of modified files t/perf/p7519: add fsmonitor--daemon test cases t/perf/p7519: speed up test on Windows t/perf/p7519: fix coding style t/helper/test-chmtime: skip directories on Windows t/perf: avoid copying builtin fsmonitor files into test repo t7527: create test for fsmonitor--daemon t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon help: include fsmonitor--daemon feature flag in version info fsmonitor--daemon: implement handle_client callback compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS compat/fsmonitor/fsm-listen-darwin: add MacOS header files for FSEvent compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows fsmonitor--daemon: create token-based changed path cache fsmonitor--daemon: define token-ids fsmonitor--daemon: add pathname classification fsmonitor--daemon: implement 'start' command ... 04 April 2022, 17:56:24 UTC
ba2452b Junio C Hamano 04 April 2022, 17:56:23 UTC Merge branch 'tk/ambiguous-fetch-refspec' Give hint when branch tracking cannot be established because fetch refspecs from multiple remote repositories overlap. * tk/ambiguous-fetch-refspec: tracking branches: add advice to ambiguous refspec error 04 April 2022, 17:56:24 UTC
0f5e885 Junio C Hamano 04 April 2022, 17:56:23 UTC Merge branch 'rc/fetch-refetch' "git fetch --refetch" learned to fetch everything without telling the other side what we already have, which is useful when you cannot trust what you have in the local object store. * rc/fetch-refetch: docs: mention --refetch fetch option fetch: after refetch, encourage auto gc repacking t5615-partial-clone: add test for fetch --refetch fetch: add --refetch option builtin/fetch-pack: add --refetch option fetch-pack: add refetch fetch-negotiator: add specific noop initializer 04 April 2022, 17:56:23 UTC
1b54f5b Junio C Hamano 04 April 2022, 17:56:23 UTC Merge branch 'jc/mailsplit-warn-on-tty' "git am" can read from the standard input when no mailbox is given on the command line, but the end-user gets no indication when it happens, making Git appear stuck. * jc/mailsplit-warn-on-tty: am/apply: warn if we end up reading patches from terminal 04 April 2022, 17:56:23 UTC
fe496dc Junio C Hamano 04 April 2022, 17:56:23 UTC Merge branch 'ns/trace2-fsync-stat' Trace2 code has been taught to report stats for fsync operations. * ns/trace2-fsync-stat: trace2: add stats for fsync operations 04 April 2022, 17:56:23 UTC
da95e25 Junio C Hamano 04 April 2022, 17:56:22 UTC Merge branch 'gc/branch-recurse-submodules-fix' A handful of obvious clean-ups around a topic that is already in 'master'. * gc/branch-recurse-submodules-fix: branch.c: simplify advice-and-die sequence branch: rework comments for future developers branch: remove negative exit code branch --set-upstream-to: be consistent when advising branch: give submodule updating advice before exit branch: support more tracking modes when recursing 04 April 2022, 17:56:23 UTC
back to top