Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.25.2 2020-03-17T22:02:26Z 2020-03-17T22:02:26Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:26Z urn:sha1:7be274b0ffc57b346837ab7fb36e8fcea1c38ddd Updates to the CI settings. * js/ci-windows-update: Azure Pipeline: switch to the latest agent pools ci: prevent `perforce` from being quarantined t/lib-httpd: avoid using macOS' sed 2020-03-17T22:02:25Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:25Z urn:sha1:fe0d2c8ddb74e2ca81e86c660fb2fd3ca9a98986 Test updates. * js/test-unc-fetch: t5580: test cloning without file://, test fetching via UNC paths 2020-03-17T22:02:25Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:25Z urn:sha1:618db3621a845e02d0e557f9eed4908facbabb22 Testfix. * js/test-write-junit-xml-fix: tests: fix --write-junit-xml with subshells 2020-03-17T22:02:24Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:24Z urn:sha1:41d910ea6ce58b2d7322f7bff5877ead33f34b8c "git show" and others gave an object name in raw format in its error output, which has been corrected to give it in hex. * hd/show-one-mergetag-fix: show_one_mergetag: print non-parent in hex form. 2020-03-17T22:02:23Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:23Z urn:sha1:76ccbdaf97c8f1e6d06e6ae37304822633b50678 Fix for a bug revealed by a recent change to make the protocol v2 the default. * ds/partial-clone-fixes: partial-clone: avoid fetching when looking for objects partial-clone: demonstrate bugs in partial fetch 2020-03-17T22:02:23Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:23Z urn:sha1:569b89842df4cb1bf09c1a8a29f87cd282b7e123 The merge-recursive machinery failed to refresh the cache entry for a merge result in a couple of places, resulting in an unnecessary merge failure, which has been fixed. * en/t3433-rebase-stat-dirty-failure: merge-recursive: fix the refresh logic in update_file_flags t3433: new rebase testcase documenting a stat-dirty-like failure 2020-03-17T22:02:23Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:23Z urn:sha1:16a4bf10359edf34a7c62d6466dab2e33060d332 "git check-ignore" did not work when the given path is explicitly marked as not ignored with a negative entry in the .gitignore file. * en/check-ignore: check-ignore: fix documentation and implementation to match 2020-03-17T22:02:22Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:22Z urn:sha1:1a4abcbb3b7950d6367be5e142503173088a078c The code to automatically shrink the fan-out in the notes tree had an off-by-one bug, which has been killed. * jh/notes-fanout-fix: notes.c: fix off-by-one error when decreasing notes fanout t3305: check notes fanout more carefully and robustly 2020-03-17T22:02:22Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:21Z urn:sha1:7e84f4608f9c1f2217e7601010c2451f31dc4e92 The index-pack code now diagnoses a bad input packstream that records the same object twice when it is used as delta base; the code used to declare a software bug when encountering such an input, but it is an input error. * jk/index-pack-dupfix: index-pack: downgrade twice-resolved REF_DELTA to die() 2020-03-17T22:02:21Z Junio C Hamano gitster@pobox.com 2020-03-17T22:02:21Z urn:sha1:fa24bbe8645281b66213b47909864495fc5f7536 "git rebase -i" identifies existing commits in its todo file with their abbreviated object name, which could become ambigous as it goes to create new commits, and has a mechanism to avoid ambiguity in the main part of its execution. A few other cases however were not covered by the protection against ambiguity, which has been corrected. * js/rebase-i-with-colliding-hash: rebase -i: also avoid SHA-1 collisions with missingCommitsCheck rebase -i: re-fix short SHA-1 collision parse_insn_line(): improve error message when parsing failed