Skip to main content

Browse the archive

swh:1:snp:47f1e8bb459169b0feb652a9c3d9cbabd8526d4a
sort by:
Revision Author Date Message Commit Date
2d5e9f3 Junio C Hamano 26 May 2020, 16:38:13 UTC Git 2.27-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 May 2020, 16:38:13 UTC
21a15f4 Junio C Hamano 26 May 2020, 16:32:08 UTC Merge branch 'ss/faq-ignore' Doc markup fix. * ss/faq-ignore: gitfaq: avoid validation error with older asciidoc 26 May 2020, 16:32:08 UTC
5c752ff Todd Zullinger 19 May 2020, 04:53:01 UTC gitfaq: avoid validation error with older asciidoc When building with asciidoc-8.4.5 (as found on CentOS/Red Hat 6), the period in the "[[files-in-.gitignore-are-tracked]]" anchor is not properly parsed as a section: WARNING: gitfaq.txt: line 245: missing [[files-in-.gitignore-are-tracked]] section The resulting XML file fails to validate with xmlto: xmlto: /git/Documentation/gitfaq.xml does not validate (status 3) xmlto: Fix document syntax or use --skip-validation option /git/Documentation/gitfaq.xml:3: element refentry: validity error : Element refentry content does not follow the DTD, expecting (beginpage? , indexterm* , refentryinfo? , refmeta? , (remark | link | olink | ulink)* , refnamediv+ , refsynopsisdiv? , (refsect1+ | refsection+)), got (refmeta refnamediv refsynopsisdiv refsect1 refsect1 refsect1 refsect1 variablelist refsect1 refsect1 ) Document /git/Documentation/gitfaq.xml does not validate Let's avoid breaking users of platforms which ship an old version of asciidoc, since the cost to do so is quite low. Reported-by: Son Luong Ngoc <sluongng@gmail.com> Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 May 2020, 18:59:26 UTC
d2ecc46 Junio C Hamano 25 May 2020, 01:13:53 UTC Hopefully final batch before 2.27-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 May 2020, 02:39:40 UTC
ea7aa4f Junio C Hamano 25 May 2020, 02:39:40 UTC Merge branch 'dd/t5703-grep-a-fix' Update an unconditional use of "grep -a" with a perl script in a test. * dd/t5703-grep-a-fix: t5703: replace "grep -a" usage by perl 25 May 2020, 02:39:40 UTC
d55a4ae Junio C Hamano 25 May 2020, 02:39:39 UTC Merge branch 'ds/multi-pack-verify' Fix for a copy-and-paste error introduced during 2.20 era. * ds/multi-pack-verify: fsck: use ERROR_MULTI_PACK_INDEX 25 May 2020, 02:39:39 UTC
36fec2a Junio C Hamano 25 May 2020, 02:39:38 UTC Merge branch 'ma/doc-fixes' Various doc fixes. * ma/doc-fixes: git-sparse-checkout.txt: add missing ' git-credential.txt: use list continuation git-commit-graph.txt: fix list rendering git-commit-graph.txt: fix grammo date-formats.txt: fix list continuation 25 May 2020, 02:39:38 UTC
666b97a Junio C Hamano 25 May 2020, 02:39:38 UTC Merge branch 'cb/bisect-replay-with-dos-fix' Re-fix longstanding "edited bisect log may confuse bisect replay with trailing carriage-return" issue. * cb/bisect-replay-with-dos-fix: bisect: avoid tailing CR characters from revision in replay 25 May 2020, 02:39:38 UTC
f37d959 Junio C Hamano 25 May 2020, 02:39:38 UTC Merge branch 'gs/commit-graph-path-filter' Test fix. * gs/commit-graph-path-filter: t4216: avoid unnecessary subshell in test_bloom_filters_not_used 25 May 2020, 02:39:38 UTC
4cf237c Junio C Hamano 25 May 2020, 02:39:37 UTC Merge branch 'dl/merge-autostash' Test fix. * dl/merge-autostash: t5520: avoid alternation in grep's BRE (not POSIX) 25 May 2020, 02:39:37 UTC
80e013c Junio C Hamano 25 May 2020, 02:39:36 UTC Merge branch 'bc/faq' "git help guides" now includes the newly added FAQ document. * bc/faq: command-list.txt: add gitfaq to the list of guides 25 May 2020, 02:39:36 UTC
09dcde9 Junio C Hamano 25 May 2020, 02:39:35 UTC Merge branch 'jt/avoid-prefetch-when-able-in-diff' Test-coverage enhancement. * jt/avoid-prefetch-when-able-in-diff: t4067: make rename detection test output raw diff 25 May 2020, 02:39:36 UTC
df0a5e4 Junio C Hamano 25 May 2020, 02:39:35 UTC Merge branch 'gp/hppa-stack-test-fix' Platform dependent tweak to a test for HP-PA. * gp/hppa-stack-test-fix: tests: skip small-stack tests on hppa architecture 25 May 2020, 02:39:35 UTC
ae92ac8 Junio C Hamano 21 May 2020, 18:15:04 UTC Merge https://github.com/prati0100/git-gui * https://github.com/prati0100/git-gui: git-gui: Handle Ctrl + BS/Del in the commit msg Subject: git-gui: fix syntax error because of missing semicolon 21 May 2020, 18:15:04 UTC
c195247 Pratyush Yadav 21 May 2020, 12:55:32 UTC Merge branch 'il/ctrl-bs-del' Allow deleting words backwards and forwards using Ctrl + Backspace and Delete in the commit message buffer. * il/ctrl-bs-del: git-gui: Handle Ctrl + BS/Del in the commit msg 21 May 2020, 12:55:32 UTC
173cb08 Carlo Marcelo Arenas Belón 20 May 2020, 17:08:43 UTC bisect: avoid tailing CR characters from revision in replay 6c722cbe5a (bisect: allow CRLF line endings in "git bisect replay" input, 2020-05-07) includes CR as a field separator, but relies on it not being included in the last field, which breaks at least when running under OpenBSD 6.7's sh. Instead of just assume the CR will get swallowed, read the rest of the line into an otherwise unused variable and ignore it everywhere except on the call for git bisect start, where it matters. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2020, 17:13:19 UTC
2cf579c Philippe Blain 20 May 2020, 14:44:48 UTC command-list.txt: add gitfaq to the list of guides When 'gitfaq.txt' was added in 2149b6748f (docs: add a FAQ, 2020-03-30), it was added to the Makefile but not to command-list.txt. Add it there also, so that the new FAQ is listed in the output of `git help --guides`. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2020, 16:00:58 UTC
c703309 Carlo Marcelo Arenas Belón 20 May 2020, 03:44:44 UTC t5520: avoid alternation in grep's BRE (not POSIX) Instead of using a BRE, that broke tests 30-32, 37-39, 42 at least with OpenBSD 6.7; use a simpler ERE. Fixes: d9f15d37f1 (pull: pass --autostash to merge, 2020-04-07) Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2020, 15:57:07 UTC
784ce03 Carlo Marcelo Arenas Belón 20 May 2020, 03:44:42 UTC t4216: avoid unnecessary subshell in test_bloom_filters_not_used Seems to trigger a bug in at least OpenBSD's 6.7 sh where it is interpreted as a history lookup and therefore fails 125-126, 128, 130. Remove the subshell and get a space between ! and grep, so tests pass successfully. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2020, 15:56:12 UTC
87680d3 Junio C Hamano 20 May 2020, 15:33:55 UTC Git 2.27-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2020, 15:33:55 UTC
22954ba Junio C Hamano 20 May 2020, 15:33:29 UTC Merge branch 'es/bugreport' Doc fix. * es/bugreport: git-bugreport.txt: adjust reference to strftime(3) 20 May 2020, 15:33:30 UTC
7c65901 Junio C Hamano 20 May 2020, 15:33:29 UTC Merge branch 'ak/slab-decl-cleanup' Code clean-up. * ak/slab-decl-cleanup: commit-slab-decl.h: update include guard 20 May 2020, 15:33:29 UTC
972ce85 Junio C Hamano 20 May 2020, 15:33:29 UTC Merge branch 'jc/fix-tap-output-under-bash' A recent attempt to make the test output nicer to view on CI systems broke TAP output under bash. The effort has been reverted to be re-attempted in the next cycle. * jc/fix-tap-output-under-bash: Revert "tests: when run in Bash, annotate test failures with file name/line number" Revert "ci: add a problem matcher for GitHub Actions" Revert "t/test_lib: avoid naked bash arrays in file_lineno" 20 May 2020, 15:33:29 UTC
fde4622 Junio C Hamano 20 May 2020, 15:33:29 UTC Merge branch 'en/sparse-checkout' Consistency fix to a topic already in 'master'. * en/sparse-checkout: unpack-trees: also allow get_progress() to work on a different index 20 May 2020, 15:33:29 UTC
85d6e28 Junio C Hamano 20 May 2020, 15:33:28 UTC Merge branch 'ds/trace-log-progress-fix' Last-minute fix for our recent change to allow use of progress API as a traceable region. * ds/trace-log-progress-fix: progress: call trace2_region_leave() only after calling _enter() 20 May 2020, 15:33:28 UTC
55df1a6 Junio C Hamano 20 May 2020, 15:33:27 UTC Merge branch 'js/ci-sdk-download-fix' Instead of downloading Windows SDK for CI jobs for windows builds from an external site (wingit.blob.core.windows.net), use the one created in the windows-build job, to work around quota issues at the external site. * js/ci-sdk-download-fix: ci: avoid pounding on the poor ci-artifacts container 20 May 2020, 15:33:28 UTC
abbd1d9 Junio C Hamano 20 May 2020, 15:33:27 UTC Merge branch 'en/merge-rename-rename-worktree-fix' When a binary file gets modified and renamed on both sides of history to different locations, both files would be written to the working tree but both would have the contents from "ours". This has been corrected so that the path from each side gets their original content. * en/merge-rename-rename-worktree-fix: merge-recursive: fix rename/rename(1to2) for working tree with a binary 20 May 2020, 15:33:27 UTC
7b304ab Junio C Hamano 20 May 2020, 15:33:27 UTC Merge branch 'cb/no-more-gmtime' Code clean-up by removing a compatibility implementation of a function we no longer use. * cb/no-more-gmtime: compat: remove gmtime 20 May 2020, 15:33:27 UTC
74c6cba Junio C Hamano 20 May 2020, 15:33:26 UTC Merge branch 'dd/t1509-i18n-fix' A few tests were not i18n clean. * dd/t1509-i18n-fix: t1509: correct i18n test 20 May 2020, 15:33:26 UTC
e68a527 Derrick Stolee 19 May 2020, 19:48:45 UTC fsck: use ERROR_MULTI_PACK_INDEX The multi-pack-index was added to the data verified by git-fsck in ea5ae6c3 "fsck: verify multi-pack-index". This implementation was based on the implementation for verifying the commit-graph, and a copy-paste error kept the ERROR_COMMIT_GRAPH flag as the bit set when an error appears in the multi-pack-index. Add a new flag, ERROR_MULTI_PACK_INDEX, and use that instead. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 May 2020, 23:13:22 UTC
293194c Jonathan Tan 19 May 2020, 18:31:51 UTC t4067: make rename detection test output raw diff 95acf11a3d ("diff: restrict when prefetching occurs", 2020-04-07) taught diff to prefetch blobs in a more limited set of situations. These limited situations include when the output format requires blob data, and when inexact rename detection is needed. There is an existing test case that tests inexact rename detection, but it also uses an output format that requires blob data, resulting in the inexact-rename-detection-only code not being tested. Update this test to use the raw output format, which does not require blob data. Thanks to Derrick Stolee for noticing this lapse in code coverage and for doing the preliminary analysis [1]. [1] https://lore.kernel.org/git/853759d3-97c3-241f-98e1-990883cd204e@gmail.com/ Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 May 2020, 23:09:16 UTC
1eb7371 Đoàn Trần Công Danh 19 May 2020, 00:50:46 UTC t5703: replace "grep -a" usage by perl On some platforms likes HP-UX, grep(1) doesn't understand "-a". Let's switch to perl. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 May 2020, 18:15:23 UTC
e264335 Martin Ågren 17 May 2020, 18:52:21 UTC git-sparse-checkout.txt: add missing ' Where we explain the 'reapply' command, we don't properly wrap it in single quote marks like we do with the other commands: We omit the closing mark ("'reapply") and this ends up being rendered literally as "'reapply". Add the missing "'". Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2020, 20:19:54 UTC
0d9cdbc Martin Ågren 17 May 2020, 18:52:20 UTC git-credential.txt: use list continuation Use list continuation to avoid the second and third paragraphs rendering with a different indentation from the first one where we describe the "url" attribute. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2020, 20:19:33 UTC
ce3614c Martin Ågren 17 May 2020, 18:52:19 UTC git-commit-graph.txt: fix list rendering The first list item follows immediately on the paragraph where we introduce the list. This makes the "*" render literally as part of one huge paragraph. (With AsciiDoc, everything is fine after that, but with Asciidoctor, we get some minor follow-on errors.) Add an empty line -- with a list continuation ("+") -- to make the first list item render ok. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2020, 20:19:23 UTC
1aa7b68 Martin Ågren 17 May 2020, 18:52:18 UTC git-commit-graph.txt: fix grammo It's easy to mix up the possessive "its" and "it's" ("it is"). Correct an instance of this. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2020, 20:19:20 UTC
833375f Martin Ågren 17 May 2020, 18:52:16 UTC date-formats.txt: fix list continuation The blank line before the lone "+" means it isn't detected as a list continuation, but instead renders literally, at least with AsciiDoc. Drop the empty line and, while at it, add a closing period to the preceding paragraph. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2020, 20:18:56 UTC
01b62aa Todd Zullinger 18 May 2020, 19:37:36 UTC git-bugreport.txt: adjust reference to strftime(3) The strftime(3) man page is outside of the Git suite. Refererence it as we do other external man pages and avoid creating a broken link when generating the HTML documentation. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2020, 19:54:53 UTC
9892dc8 Abhishek Kumar 18 May 2020, 14:30:23 UTC commit-slab-decl.h: update include guard When a9f1f1f9f8 ("commit-slab.h: code split", 2018-05-19) split commit-slab.h into commit-slab-decl.h and commit-slab-impl.h header files, commit-slab-decl.h were left to use "COMMIT_SLAB_HDR_H", while commit-slab-impl.h gained its own macro, "COMMIT_SLAB_IMPL_H". As these two files use different include guards, there is nothing broken, but let's update commit-slab-decl.h to match the convention to name the include guard after the filename. Signed-off-by: Abhishek Kumar <abhishekkumar8222@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2020, 17:33:00 UTC
ddcfc7c Greg Price 16 May 2020, 05:33:38 UTC tests: skip small-stack tests on hppa architecture On hppa these tests crash because the allocated stack space is too small, even after it was doubled in b9a190789 (and the data size doubled to match) to make it work on powerpc. For this arch just skip these tests, which is enough to make the whole suite pass. Fixes: https://bugs.debian.org/757402 Based-on-patch-by: John David Anglin <dave.anglin@bell.net> Signed-off-by: Greg Price <gnprice@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 May 2020, 17:05:12 UTC
e31600b Junio C Hamano 15 May 2020, 16:47:51 UTC Revert "tests: when run in Bash, annotate test failures with file name/line number" This reverts commit 662f9cf1548cf069cb819e9e95f224657015fcf9, to fix the TAP output broken for bash. 15 May 2020, 17:25:58 UTC
4024295 Junio C Hamano 15 May 2020, 17:24:02 UTC Revert "ci: add a problem matcher for GitHub Actions" This reverts commit 676eb0c1ce0d380478eb16bdc5a3f2a7bc01c1d2; as we will be reverting the change to show these extra output tokens under bash, the pattern would not match anything. Helped-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2020, 17:25:58 UTC
3d7b2b4 Junio C Hamano 15 May 2020, 16:47:18 UTC Revert "t/test_lib: avoid naked bash arrays in file_lineno" This reverts commit 303775a25f0b4ac5d6ad2e96eb4404c24209cad8; instead of trying to salvage the tap-breaking change, let's revert the whole thing for now. 15 May 2020, 16:47:18 UTC
3af029c Derrick Stolee 15 May 2020, 16:09:28 UTC progress: call trace2_region_leave() only after calling _enter() A user of progress API calls start_progress() conditionally and depends on the display_progress() and stop_progress() functions to become no-op when start_progress() hasn't been called. As we added a call to trace2_region_enter() to start_progress(), the calls to other trace2 API calls from the progress API functions must make sure that these trace2 calls are skipped when start_progress() hasn't been called on the progress struct. Specifically, do not call trace2_region_leave() from stop_progress() when we haven't called start_progress(), which would have called the matching trace2_region_enter(). Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2020, 16:41:30 UTC
857341c Johannes Schindelin 15 May 2020, 07:55:18 UTC ci: avoid pounding on the poor ci-artifacts container When this developer tested how the git-sdk-64-minimal artifact could be served to all the GitHub workflow runs that need it, Azure Blobs looked like a pretty good choice: it is reliable, fast and we already use it in Git for Windows to serve components like OpenSSL, cURL, etc It came as an unpleasant surprise just _how many_ times this artifact was downloaded. It exploded the bandwidth to a point where the free tier would no longer be enough, threatening to block other, essential Git for Windows services. Let's switch back to using the Build Artifacts of our trusty Azure Pipeline for the time being. To avoid unnecessary hammering of the Azure Pipeline artifacts, we use the GitHub Action `actions/upload-artifact` in the `windows-build` job and the GitHub Action `actions/download-artifact` in the `windows-test` and `vs-test` jobs (the latter now depends on `windows-build` for that reason, too). Helped-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2020, 15:02:30 UTC
6c34239 Elijah Newren 14 May 2020, 19:53:22 UTC unpack-trees: also allow get_progress() to work on a different index commit b0a5a12a60 ("unpack-trees: allow check_updates() to work on a different index", 2020-03-27) allowed check_updates() to work on a different index, but it called get_progress() which was hardcoded to work on o->result much like check_updates() had been. Update it to also accept an index parameter and have check_updates() pass that parameter along so that both are working on the same index. Noticed-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2020, 14:59:27 UTC
efcab5b Junio C Hamano 14 May 2020, 21:39:28 UTC Git 2.27-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 May 2020, 21:39:45 UTC
d98abce Junio C Hamano 14 May 2020, 21:39:45 UTC Merge branch 'es/trace-log-progress' Teach codepaths that show progress meter to also use the start_progress() and the stop_progress() calls as a "region" to be traced. * es/trace-log-progress: trace2: log progress time and throughput 14 May 2020, 21:39:45 UTC
ac140be Junio C Hamano 14 May 2020, 21:39:45 UTC Merge branch 'jt/t5500-unflake' Test fix for a topic already in 'master' and meant for 'maint'. * jt/t5500-unflake: t5500: count objects through stderr, not trace 14 May 2020, 21:39:45 UTC
6baba94 Junio C Hamano 14 May 2020, 21:39:44 UTC Merge branch 'sn/midx-repack-with-config' "git multi-pack-index repack" has been taught to honor some repack.* configuration variables. * sn/midx-repack-with-config: multi-pack-index: respect repack.packKeptObjects=false midx: teach "git multi-pack-index repack" honor "git repack" configurations 14 May 2020, 21:39:44 UTC
4b1e5e5 Junio C Hamano 14 May 2020, 21:39:44 UTC Merge branch 'ds/bloom-cleanup' Code cleanup and typofixes * ds/bloom-cleanup: completion: offer '--(no-)patch' among 'git log' options bloom: use num_changes not nr for limit detection bloom: de-duplicate directory entries Documentation: changed-path Bloom filters use byte words bloom: parse commit before computing filters test-bloom: fix usage typo bloom: fix whitespace around tab length 14 May 2020, 21:39:44 UTC
0498840 Junio C Hamano 14 May 2020, 21:39:43 UTC Merge branch 'rs/fsck-duplicate-names-in-trees' "git fsck" ensures that the paths recorded in tree objects are sorted and without duplicates, but it failed to notice a case where a blob is followed by entries that sort before a tree with the same name. This has been corrected. * rs/fsck-duplicate-names-in-trees: fsck: report non-consecutive duplicate names in trees 14 May 2020, 21:39:44 UTC
f4507ce Junio C Hamano 14 May 2020, 21:39:43 UTC Merge branch 'ao/p4-d-f-conflict-recover' "git p4" learned to recover from a (broken) state where a directory and a file are recorded at the same path in the Perforce repository the same way as their clients do. * ao/p4-d-f-conflict-recover: git-p4: recover from inconsistent perforce history 14 May 2020, 21:39:43 UTC
a2a0942 Junio C Hamano 14 May 2020, 21:39:43 UTC Merge branch 'js/rebase-autosquash-double-fixup-fix' "rebase -i" segfaulted when rearranging a sequence that has a fix-up that applies another fix-up (which may or may not be a fix-up of yet another step). * js/rebase-autosquash-double-fixup-fix: rebase --autosquash: fix a potential segfault 14 May 2020, 21:39:43 UTC
73d9f96 Junio C Hamano 14 May 2020, 21:39:42 UTC Merge branch 'jc/codingstyle-compare-with-null' Doc update. * jc/codingstyle-compare-with-null: CodingGuidelines: do not ==/!= compare with 0 or '\0' or NULL 14 May 2020, 21:39:42 UTC
f9dbe28 Junio C Hamano 14 May 2020, 21:39:41 UTC Merge branch 'cw/bisect-replay-with-dos' "git bisect replay" had trouble with input files when they used CRLF line ending, which has been corrected. * cw/bisect-replay-with-dos: bisect: allow CRLF line endings in "git bisect replay" input 14 May 2020, 21:39:41 UTC
3583730 Junio C Hamano 14 May 2020, 21:39:40 UTC Merge branch 'es/bugreport-with-hooks' "git bugreport" learned to report enabled hooks in the repository. * es/bugreport-with-hooks: bugreport: collect list of populated hooks 14 May 2020, 21:39:41 UTC
84b0115 Carlo Marcelo Arenas Belón 14 May 2020, 19:18:54 UTC compat: remove gmtime ccd469450a (date.c: switch to reentrant {gm,local}time_r, 2019-11-28) removes the only gmtime() call we had and moves to gmtime_r() which doesn't have the same portability problems. Remove the compat gmtime code since it is no longer needed, and confirm by successfull running t4212 in FreeBSD 9.3 amd64 (the oldest I could get a hold off). Further work might be needed to ensure 32bit time_t systems (like FreeBSD i386) will handle correctly the overflows tested in t4212, but that is orthogonal to this change, and it doesn't change the current behaviour as neither gmtime() or gmtime_r() will ever return NULL on those systems because time_t is unsigned. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 May 2020, 20:52:27 UTC
95983da Elijah Newren 13 May 2020, 23:56:32 UTC merge-recursive: fix rename/rename(1to2) for working tree with a binary With a rename/rename(1to2) conflict, we attempt to do a three-way merge of the file contents, so that the correct contents can be placed in the working tree at both paths. If the file is a binary, however, no content merging is possible and we should just use the original version of the file at each of the paths. Reported-by: Chunlin Zhang <zhangchunlin@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 May 2020, 19:14:19 UTC
172e8ff Junio C Hamano 13 May 2020, 18:31:14 UTC The ninth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 May 2020, 19:19:21 UTC
a012588 Junio C Hamano 13 May 2020, 19:19:21 UTC Merge branch 'cc/upload-pack-v2-fetch-fix' Serving a "git fetch" client over "git://" and "ssh://" protocols using the on-wire protocol version 2 was buggy on the server end when the client needs to make a follow-up request to e.g. auto-follow tags. * cc/upload-pack-v2-fetch-fix: upload-pack: clear filter_options for each v2 fetch command 13 May 2020, 19:19:21 UTC
ce1adb1 Junio C Hamano 13 May 2020, 19:19:20 UTC Merge branch 'ds/sparse-updates-oob-access-fix' The code to skip unmerged paths in the index when sparse checkout is in use would have made out-of-bound access of the in-core index when the last path was unmerged, which has been corrected. * ds/sparse-updates-oob-access-fix: unpack-trees: avoid array out-of-bounds error 13 May 2020, 19:19:20 UTC
9e8ed17 Junio C Hamano 13 May 2020, 19:19:20 UTC Merge branch 'ss/submodule-set-url-in-c' Rewriting various parts of "git submodule" in C continues. * ss/submodule-set-url-in-c: submodule: port subcommand 'set-url' from shell to C 13 May 2020, 19:19:20 UTC
2e72299 Junio C Hamano 13 May 2020, 19:19:20 UTC Merge branch 'dd/bloom-sparse-fix' Code clean-up. * dd/bloom-sparse-fix: bloom: fix `make sparse` warning 13 May 2020, 19:19:20 UTC
dd4a287 Junio C Hamano 13 May 2020, 19:19:19 UTC Merge branch 'jk/ci-only-on-selected-branches' Instead of always building all branches at GitHub via Actions, users can specify which branches to build. * jk/ci-only-on-selected-branches: ci: allow per-branch config for GitHub Actions 13 May 2020, 19:19:19 UTC
94afbbb Junio C Hamano 13 May 2020, 19:19:19 UTC Merge branch 'ss/faq-fetch-pull' Random bits of FAQ. * ss/faq-fetch-pull: gitfaq: fetching and pulling a repository 13 May 2020, 19:19:19 UTC
6586242 Junio C Hamano 13 May 2020, 19:19:19 UTC Merge branch 'ss/faq-ignore' Random bits of FAQ. * ss/faq-ignore: gitfaq: files in .gitignore are tracked 13 May 2020, 19:19:19 UTC
3af459e Junio C Hamano 13 May 2020, 19:19:19 UTC Merge branch 'jc/auto-gc-quiet' Teach "am", "commit", "merge" and "rebase", when they are run with the "--quiet" option, to pass "--quiet" down to "gc --auto". * jc/auto-gc-quiet: auto-gc: pass --quiet down from am, commit, merge and rebase auto-gc: extract a reusable helper from "git fetch" 13 May 2020, 19:19:19 UTC
aa28171 Junio C Hamano 13 May 2020, 19:19:18 UTC Merge branch 'cb/credential-doc-fixes' Minor in-code comments and documentation updates around credential API. * cb/credential-doc-fixes: credential: document protocol updates credential: update gitcredentials documentation credential: correct order of parameters for credential_match credential: update description for credential_from_url_gently 13 May 2020, 19:19:19 UTC
69ae8ff Junio C Hamano 13 May 2020, 19:19:18 UTC Merge branch 'tb/bitmap-walk-with-tree-zero-filter' The object walk with object filter "--filter=tree:0" can now take advantage of the pack bitmap when available. * tb/bitmap-walk-with-tree-zero-filter: pack-bitmap: pass object filter to fill-in traversal pack-bitmap.c: support 'tree:0' filtering pack-bitmap.c: make object filtering functions generic list-objects-filter: treat NULL filter_options as "disabled" 13 May 2020, 19:19:18 UTC
896833b Junio C Hamano 13 May 2020, 19:19:18 UTC Merge branch 'tb/shallow-cleanup' Code cleanup. * tb/shallow-cleanup: shallow: use struct 'shallow_lock' for additional safety shallow.h: document '{commit,rollback}_shallow_file' shallow: extract a header file for shallow-related functions commit: make 'commit_graft_pos' non-static 13 May 2020, 19:19:18 UTC
27e29f8 Đoàn Trần Công Danh 13 May 2020, 13:23:06 UTC t1509: correct i18n test git-init(1)'s messages is subjected to i18n. They should be tested by test_i18n* family. Fix them. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 May 2020, 16:59:00 UTC
98a1364 Emily Shaffer 12 May 2020, 21:44:20 UTC trace2: log progress time and throughput Rather than teaching only one operation, like 'git fetch', how to write down throughput to traces, we can learn about a wide range of user operations that may seem slow by adding tooling to the progress library itself. Operations which display progress are likely to be slow-running and the kind of thing we want to monitor for performance anyways. By showing object counts and data transfer size, we should be able to make some derived measurements to ensure operations are scaling the way we expect. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 May 2020, 22:30:39 UTC
e589414 Ismael Luceno 12 May 2020, 10:28:06 UTC git-gui: Handle Ctrl + BS/Del in the commit msg - Control+BackSpace: Delete word to the left of the cursor. - Control+Delete : Delete word to the right of the cursor. Originally introduced by BRIEF and Turbo Vision between 1985 and 1992, they were adopted by most CUA-Compliant UIs, including those of: OS/2, Windows, Mac OS, Qt, GTK, Open/Libre Office, Gecko, and GNU Emacs. In both cases Tk already implements the functionality bound to other key combination, so we use that. Graphical examples: Deleting to the left: v------ pointer X_WORD____X ^-----^------ selection Deleting to the right: v--------- pointer X_WORD_X ^--^------ selection Signed-off-by: Ismael Luceno <ismael.luceno@tttech-auto.com> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> 12 May 2020, 12:53:49 UTC
b928e48 SZEDER Gábor 11 May 2020, 11:56:14 UTC completion: offer '--(no-)patch' among 'git log' options Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 May 2020, 16:33:56 UTC
2f6775f Derrick Stolee 11 May 2020, 11:56:13 UTC bloom: use num_changes not nr for limit detection As diff_tree_oid() computes a diff, it will terminate early if the total number of changed paths is strictly larger than max_changes. This includes the directories that changed, not just the file paths. However, only the file paths are reflected in the resulting diff queue's "nr" value. Use the "num_changes" from diffopt to check if the diff terminated early. This is incredibly important, as it can result in incorrect filters! For example, the first commit in the Linux kernel repo reports only 471 changes, but since these are nested inside several directories they expand to 513 "real" changes, and in fact the total list of changes is not reported. Thus, the computed filter for this commit is incorrect. Demonstrate the subtle difference by using one fewer file change in the 'get bloom filter for commit with 513 changes' test. Before, this edited 513 files inside "bigDir" which hit this inequality. However, dropping the file count by one demonstrates how the previous inequality was incorrect but the new one is correct. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 May 2020, 16:33:56 UTC
65c1a28 Derrick Stolee 11 May 2020, 11:56:12 UTC bloom: de-duplicate directory entries When computing a changed-path Bloom filter, we need to take the files that changed from the diff computation and extract the parent directories. That way, a directory pathspec such as "Documentation" could match commits that change "Documentation/git.txt". However, the current code does a poor job of this process. The paths are added to a hashmap, but we do not check if an entry already exists with that path. This can create many duplicate entries and cause the filter to have a much larger length than it should. This means that the filter is more sparse than intended, which helps the false positive rate, but wastes a lot of space. Properly use hashmap_get() before hashmap_add(). Also be sure to include a comparison function so these can be matched correctly. This has an effect on a test in t0095-bloom.sh. This makes sense, there are ten changes inside "smallDir" so the total number of paths in the filter should be 11. This would result in 11 * 10 bits required, and with 8 bits per byte, this results in 14 bytes. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 May 2020, 16:33:56 UTC
8809328 Derrick Stolee 11 May 2020, 11:56:11 UTC Documentation: changed-path Bloom filters use byte words In Documentation/technical/commit-graph-format.txt, the definition of the BIDX chunk specifies the length is a number of 8-byte words. During development we discovered that using 8-byte words in the Murmur3 hash algorithm causes issues with big-endian versus little- endian machines. Thus, the hash algorithm was adapted to work on a byte-by-byte basis. However, this caused a change in the definition of a "word" in bloom.h. Now, a "word" is a single byte, which allows filters to be as small as two bytes. These length-two filters are demonstrated in t0095-bloom.sh, and a larger filter of length 25 is demonstrated as well. The original point of using 8-byte words was for alignment reasons. It also presented opportunities for extremely sparse Bloom filters when there were a small number of changes at a commit, creating a very low false-positive rate. However, modifying the format at this point is unlikely to be a valuable exercise. Also, this use of single-byte granularity does present opportunities to save space. It is unclear if 8-byte alignment of the filters would present any meaningful performance benefits. Modify the format document to reflect reality. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 May 2020, 16:33:56 UTC
891c17c Derrick Stolee 11 May 2020, 11:56:10 UTC bloom: parse commit before computing filters When computing changed-path Bloom filters for a commit, we need to know if the commit has a parent or not. If the commit is not parsed, then its parent pointer will be NULL. As far as I can tell, the only opportunity to reach this code without parsing the commit is inside "test-tool bloom get_filter_for_commit" but it is best to be safe. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 May 2020, 16:33:56 UTC
9068cfb René Scharfe 10 May 2020, 16:12:16 UTC fsck: report non-consecutive duplicate names in trees Tree entries are sorted in path order, meaning that directory names get a slash ('/') appended implicitly. Git fsck checks if trees contains consecutive duplicates, but due to that ordering there can be non-consecutive duplicates as well if one of them is a directory and the other one isn't. Such a tree cannot be fully checked out. Find these duplicates by recording candidate file names on a stack and check candidate directory names against that stack to find matches. Suggested-by: Brandon Williams <bwilliamseng@gmail.com> Original-test-by: Brandon Williams <bwilliamseng@gmail.com> Signed-off-by: René Scharfe <l.s.r@web.de> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 May 2020, 15:40:28 UTC
82e46d6 Andrew Oakley 10 May 2020, 10:16:50 UTC git-p4: recover from inconsistent perforce history Perforce allows you commit files and directories with the same name, so you could have files //depot/foo and //depot/foo/bar both checked in. A p4 sync of a repository in this state fails. Deleting one of the files recovers the repository. When this happens we want git-p4 to recover in the same way as perforce. Note that Perforce has this change in their 2017.1 version: Bugs fixed in 2017.1 #1489051 (Job #2170) ** Submitting a file with the same name as an existing depot directory path (or vice versa) will now be rejected. so people hopefully will not creating damaged Perforce repos anymore, but "git p4" needs to be able to interact with already corrupt ones. Signed-off-by: Andrew Oakley <andrew@adoakley.name> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 May 2020, 16:58:50 UTC
3ce4ca0 Derrick Stolee 10 May 2020, 16:07:34 UTC multi-pack-index: respect repack.packKeptObjects=false When selecting a batch of pack-files to repack in the "git multi-pack-index repack" command, Git should respect the repack.packKeptObjects config option. When false, this option says that the pack-files with an associated ".keep" file should not be repacked. This config value is "false" by default. There are two cases for selecting a batch of objects. The first is the case where the input batch-size is zero, which specifies "repack everything". The second is with a non-zero batch size, which selects pack-files using a greedy selection criteria. Both of these cases are updated and tested. Reported-by: Son Luong Ngoc <sluongng@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 May 2020, 16:50:55 UTC
e11d86d Son Luong Ngoc 10 May 2020, 16:07:33 UTC midx: teach "git multi-pack-index repack" honor "git repack" configurations When the "repack" subcommand of "git multi-pack-index" command creates new packfile(s), it does not call the "git repack" command but instead directly calls the "git pack-objects" command, and the configuration variables meant for the "git repack" command, like "repack.usedaeltabaseoffset", are ignored. Check the configuration variables used by "git repack" ourselves in "git multi-index-pack" and pass the corresponding options to underlying "git pack-objects". Note that `repack.writeBitmaps` configuration is ignored, as the pack bitmap facility is useful only with a single packfile. Signed-off-by: Son Luong Ngoc <sluongng@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 May 2020, 16:50:53 UTC
02471e7 Johannes Schindelin 09 May 2020, 19:23:39 UTC rebase --autosquash: fix a potential segfault When rearranging the todo list so that the fixups/squashes are reordered just after the commits they intend to fix up, we use two arrays to maintain that list: `next` and `tail`. The idea is that `next[i]`, if set to a non-negative value, contains the index of the item that should be rearranged just after the `i`th item. To avoid having to walk the entire `next` chain when appending another fixup/squash, we also store the end of the `next` chain in `tail[i]`. The logic we currently use to update these array items is based on the assumption that given a fixup/squash item at index `i`, we just found the index `i2` indicating the first item in that fixup chain. However, as reported by Paul Ganssle, that need not be true: the special form `fixup! <commit-hash>` is allowed to point to _another_ fixup commit in the middle of the fixup chain. Example: * 0192a To fixup * 02f12 fixup! To fixup * 03763 fixup! To fixup * 04ecb fixup! 02f12 Note how the fourth commit targets the second commit, which is already a fixup that targets the first commit. Previously, we would update `next` and `tail` under our assumption that every `fixup!` commit would find the start of the `fixup!`/`squash!` chain. This would lead to a segmentation fault because we would actually end up with a `next[i]` pointing to a `fixup!` but the corresponding `tail[i]` pointing nowhere, which would the lead to a segmentation fault. Let's fix this by _inserting_, rather than _appending_, the item. In other words, if we make a given line successor of another line, we do not simply forget any previously set successor of the latter, but make it a successor of the former. In the above example, at the point when we insert 04ecb just after 02f12, 03763 would already be recorded as a successor of 04ecb, and we now "squeeze in" 04ecb. To complete the idea, we now no longer assume that `next[i]` pointing to a line means that `last[i]` points to a line, too. Instead, we extend the concept of `last` to cover also partial `fixup!`/`squash!` chains, i.e. chains starting in the middle of a larger such chain. In the above example, after processing all lines, `last[0]` (corresponding to 0192a) would point to 03763, which indeed is the end of the overall `fixup!` chain, and `last[1]` (corresponding to 02f12) would point to 04ecb (which is the last `fixup!` targeting 02f12, but it has 03763 as successor, i.e. it is not the end of overall `fixup!` chain). Reported-by: Paul Ganssle <paul@ganssle.io> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 May 2020, 20:59:55 UTC
b994622 Junio C Hamano 08 May 2020, 21:24:44 UTC The eighth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2020, 21:25:12 UTC
282ce92 Junio C Hamano 08 May 2020, 21:25:12 UTC Merge branch 'cb/test-bash-lineno-fix' Recent change to show files and line numbers of a breakage during test (only available when running the tests with bash) were hurting other shells with syntax errors, which has been corrected. * cb/test-bash-lineno-fix: t/test_lib: avoid naked bash arrays in file_lineno 08 May 2020, 21:25:12 UTC
41eae3e Junio C Hamano 08 May 2020, 21:25:12 UTC Merge branch 'cb/t0000-use-the-configured-shell' The basic test did not honor $TEST_SHELL_PATH setting, which has been corrected. * cb/t0000-use-the-configured-shell: t/t0000-basic: make sure subtests also use TEST_SHELL_PATH 08 May 2020, 21:25:12 UTC
37b48f0 Junio C Hamano 08 May 2020, 21:25:10 UTC Merge branch 'bc/doc-credential-helper-value' Doc update. * bc/doc-credential-helper-value: docs: document credential.helper allowed values 08 May 2020, 21:25:11 UTC
6381c30 Junio C Hamano 08 May 2020, 21:25:09 UTC Merge branch 'dl/doc-stash-remove-mention-of-reflog' Doc update. * dl/doc-stash-remove-mention-of-reflog: Doc: reference the "stash list" in autostash docs 08 May 2020, 21:25:09 UTC
b9bcd76 Junio C Hamano 08 May 2020, 21:25:09 UTC Merge branch 'cb/avoid-colliding-with-netbsd-hmac' The <stdlib.h> header on NetBSD brings in its own definition of hmac() function (eek), which conflicts with our own and unrelated function with the same name. Our function has been renamed to work around the issue. * cb/avoid-colliding-with-netbsd-hmac: builtin/receive-pack: avoid generic function name hmac() 08 May 2020, 21:25:09 UTC
4c2941a Junio C Hamano 08 May 2020, 21:25:08 UTC Merge branch 'es/restore-staged-from-head-by-default' "git restore --staged --worktree" now defaults to take the contents out of "HEAD", instead of erring out. * es/restore-staged-from-head-by-default: restore: default to HEAD when combining --staged and --worktree 08 May 2020, 21:25:08 UTC
6d4bf58 Junio C Hamano 08 May 2020, 21:25:07 UTC Merge branch 'jk/arith-expansion-coding-guidelines' The coding guideline for shell scripts instructed to refer to a variable with dollar-sign inside arithmetic expansion to work around a bug in old versions of dash, which is a thing of the past. Now we are not forbidden from writing $((var+1)). * jk/arith-expansion-coding-guidelines: CodingGuidelines: drop arithmetic expansion advice to use "$x" 08 May 2020, 21:25:07 UTC
e9acbd6 Junio C Hamano 08 May 2020, 21:25:06 UTC Merge branch 'ds/sparse-allow-empty-working-tree' The sparse-checkout patterns have been forbidden from excluding all paths, leaving an empty working tree, for a long time. This limitation has been lifted. * ds/sparse-allow-empty-working-tree: sparse-checkout: stop blocking empty workdirs 08 May 2020, 21:25:06 UTC
95875e0 Junio C Hamano 08 May 2020, 21:25:05 UTC Merge branch 'jt/commit-graph-plug-memleak' Fix a leak noticed by fuzzer. * jt/commit-graph-plug-memleak: commit-graph: avoid memory leaks 08 May 2020, 21:25:05 UTC
6de1630 Junio C Hamano 08 May 2020, 21:25:04 UTC Merge branch 'jk/for-each-ref-multi-key-sort-fix' "git branch" and other "for-each-ref" variants accepted multiple --sort=<key> options in the increasing order of precedence, but it had a few breakages around "--ignore-case" handling, and tie-breaking with the refname, which have been fixed. * jk/for-each-ref-multi-key-sort-fix: ref-filter: apply fallback refname sort only after all user sorts ref-filter: apply --ignore-case to all sorting keys 08 May 2020, 21:25:04 UTC
1260f81 Junio C Hamano 08 May 2020, 21:25:02 UTC Merge branch 'jk/credential-sample-update' The samples in the credential documentation has been updated to make it clear that we depict what would appear in the .git/config file, by adding appropriate quotes as needed.. * jk/credential-sample-update: gitcredentials(7): make shell-snippet example more realistic gitcredentials(7): clarify quoting of helper examples 08 May 2020, 21:25:03 UTC
dc4c393 Junio C Hamano 08 May 2020, 21:25:01 UTC Merge branch 'ah/userdiff-markdown' The userdiff patterns for Markdown documents have been added. * ah/userdiff-markdown: userdiff: support Markdown 08 May 2020, 21:25:01 UTC
933fdf8 Junio C Hamano 08 May 2020, 21:25:01 UTC Merge branch 'cb/credential-store-ignore-bogus-lines' With the recent tightening of the code that is used to parse various parts of a URL for use in the credential subsystem, a hand-edited credential-store file causes the credential helper to die, which is a bit too harsh to the users. Demote the error behaviour to just ignore and keep using well-formed lines instead. * cb/credential-store-ignore-bogus-lines: credential-store: ignore bogus lines from store file credential-store: document the file format a bit more 08 May 2020, 21:25:01 UTC
f4675f3 Junio C Hamano 08 May 2020, 21:25:00 UTC Merge branch 'dl/switch-c-option-in-error-message' In error messages that "git switch" mentions its option to create a new branch, "-b/-B" options were shown, where "-c/-C" options should be, which has been corrected. * dl/switch-c-option-in-error-message: switch: fix errors and comments related to -c and -C 08 May 2020, 21:25:00 UTC
5c7bb01 Junio C Hamano 08 May 2020, 17:51:21 UTC CodingGuidelines: do not ==/!= compare with 0 or '\0' or NULL Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2020, 18:25:12 UTC
back to top