If rerere is enabled, no pathnames are given, and mergetool is run from a subdirectory, mergetool always prints "No files need merging". Fix the bug.
This regression was introduced in 57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0). Changes since v2: * Added entries to .mailmap. * Patch 2/4 was split into multiple separate commits. * Moved '-O' out of $orderfile. * $orderfile is now adjusted after running cd_to_toplevel. * Added lots of comments. * Other minor tweaks to address review feedback. Richard Hansen (13): .mailmap: Use my personal email address as my canonical t7610: update branch names to match test number t7610: Move setup code to the 'setup' test case. t7610: use test_when_finished for cleanup tasks t7610: don't rely on state from previous test t7610: run 'git reset --hard' after each test to clean up t7610: delete some now-unnecessary 'git reset --hard' lines t7610: always work on a test-specific branch t7610: don't assume the checked-out commit t7610: spell 'git reset --hard' consistently t7610: add test case for rerere+mergetool+subdir bug mergetool: take the "-O" out of $orderfile mergetool: fix running in subdir when rerere enabled .mailmap | 2 + git-mergetool.sh | 36 ++++++- t/t7610-mergetool.sh | 276 ++++++++++++++++++++++++++++++--------------------- 3 files changed, 197 insertions(+), 117 deletions(-) -- 2.11.0.390.gc69c2f50cf-goog
smime.p7s
Description: S/MIME Cryptographic Signature
