git/t, branch v2.26.1

Git 2.26.1

2020-03-25T20:07:47Z

Signed-off-by: Junio C Hamano

Merge branch 'en/rebase-backend'

2020-03-21T20:48:54Z

Test fix. * en/rebase-backend: t3419: prevent failure when run with EXPENSIVE

t3419: prevent failure when run with EXPENSIVE

2020-03-20T22:25:24Z

This test runs a function which itself runs several assertions. The last of these assertions cleans up the .git/rebase-apply directory, since when run with EXPENSIVE set, the function is invoked a second time to run the same tests with a larger data set. However, as of 2ac0d6273f ("rebase: change the default backend from "am" to "merge"", 2020-02-15), the default backend of rebase has changed, and cleaning up the rebase-apply directory has no effect: it no longer exists, since we're using rebase-merge instead. Since we don't really care which rebase backend is in use, let's just use the command "git rebase --quit", which will do the right thing regardless. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Git 2.25.3

2020-03-18T01:12:01Z

Signed-off-by: Junio C Hamano

Merge branch 'js/ci-windows-update' into maint

2020-03-17T22:02:26Z

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

Merge branch 'js/test-unc-fetch' into maint

2020-03-17T22:02:25Z

Test updates. * js/test-unc-fetch: t5580: test cloning without file://, test fetching via UNC paths

Merge branch 'js/test-write-junit-xml-fix' into maint

2020-03-17T22:02:25Z

Testfix. * js/test-write-junit-xml-fix: tests: fix --write-junit-xml with subshells

Merge branch 'hd/show-one-mergetag-fix' into maint

2020-03-17T22:02:24Z

"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.

Merge branch 'ds/partial-clone-fixes' into maint

2020-03-17T22:02:23Z

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

Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint

2020-03-17T22:02:23Z

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