If rerere is enabled and no pathnames are given, run cd_to_toplevel before running 'git diff --name-only' so that 'git diff --name-only' sees the pathnames emitted by 'git rerere remaining'. Also run cd_to_toplevel before running 'git rerere remaining' in case 'git rerere remaining' is ever changed to print pathnames relative to the current directory rather than to $GIT_WORK_TREE. This fixes a regression introduced in 57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0). Signed-off-by: Richard Hansen --- git-mergetool.sh | 1 + t/t7610-mergetool.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index e52b4e4f2..67ea0d6db 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -456,6 +456,7 @@ main () { if test $# -eq 0 && test -e "$GIT_DIR/MERGE_RR" then + cd_to_toplevel set -- $(git rerere remaining) if test $# -eq 0 then diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index e7b3e1866..1f7d63acb 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -200,7 +200,7 @@ test_expect_success 'mergetool merges all from subdir (rerere disabled)' ' ) ' -test_expect_failure 'mergetool merges all from subdir (rerere enabled)' ' +test_expect_success 'mergetool merges all from subdir (rerere enabled)' ' git reset --hard && git checkout -b test$test_count branch1 && test_config rerere.enabled true && -- 2.11.0.390.gc69c2f50cf-goog