git, branch v2.26.0-rc1

Git 2.26-rc1

2020-03-09T18:21:21Z

Signed-off-by: Junio C Hamano

Merge branch 'rs/show-progress-in-dumb-http-fetch'

2020-03-09T18:21:21Z

"git fetch" over HTTP walker protocol did not show any progress output. We inherently do not know how much work remains, but still we can show something not to bore users. * rs/show-progress-in-dumb-http-fetch: remote-curl: show progress for fetches over dumb HTTP

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

2020-03-09T18:21:21Z

"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 'rt/format-zero-length-fix'

2020-03-09T18:21:21Z

Recently we inadvertently added a few instances of using 0-width format string to functions that we mark as printf-like without any developers noticing. The root cause was that the compiler warning that is triggered by this is almost always useless and we disabled the warning in our developer builds, but not for general public. The new instances have been corrected, and the warning has been resurrected in the developer builds. * rt/format-zero-length-fix: config.mak.dev: re-enable -Wformat-zero-length rebase-interactive.c: silence format-zero-length warnings

Merge branch 'am/mingw-poll-fix'

2020-03-09T18:21:20Z

MinGW's poll() emulation has been improved. * am/mingw-poll-fix: mingw: workaround for hangs when sending STDIN

Merge branch 'en/test-cleanup'

2020-03-09T18:21:20Z

Test cleanup. * en/test-cleanup: t6020: new test with interleaved lexicographic ordering of directories t6022, t6046: test expected behavior instead of testing a proxy for it t3035: prefer test_must_fail to bash negation for git commands t6020, t6022, t6035: update merge tests to use test helper functions t602[1236], t6034: modernize test formatting

Merge branch 'en/merge-path-collision'

2020-03-09T18:21:20Z

Handling of conflicting renames in merge-recursive have further been made consistent with how existing codepaths try to mimic what is done to add/add conflicts. * en/merge-path-collision: merge-recursive: apply collision handling unification to recursive case

Merge branch 'kk/complete-diff-color-moved'

2020-03-09T18:21:20Z

Completion update. * kk/complete-diff-color-moved: completion: add diff --color-moved[-ws]

Merge branch 'rj/t1050-use-test-path-is-file'

2020-03-09T18:21:20Z

Code cleanup. * rj/t1050-use-test-path-is-file: t1050: replace test -f with test_path_is_file

Merge branch 'pb/am-show-current-patch'

2020-03-09T18:21:19Z

"git am --short-current-patch" is a way to show the piece of e-mail for the stopped step, which is not suitable to directly feed "git apply" (it is designed to be a good "git am" input). It learned a new option to show only the patch part. * pb/am-show-current-patch: am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch am: support --show-current-patch=raw as a synonym for--show-current-patch am: convert "resume" variable to a struct parse-options: convert "command mode" to a flag parse-options: add testcases for OPT_CMDMODE()