diff options
| author | Charles Bailey <charles@hashpling.org> | 2009-01-30 23:20:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-31 10:28:33 -0800 |
| commit | ff4a18552aa48f3227e2465072951dacc34aee9b (patch) | |
| tree | 77bcfdf9d64beab8ffd4ec4702edb65614f8d60f /t | |
| parent | b9b5078ece4b22c14a36f20bd9dce88d2f350a36 (diff) | |
| download | git-ff4a18552aa48f3227e2465072951dacc34aee9b.tar.gz git-ff4a18552aa48f3227e2465072951dacc34aee9b.tar.xz | |
mergetool: fix running mergetool in sub-directories
The previous fix to mergetool to use checkout-index instead of cat-file
broke running mergetool anywhere except the root of the repository.
This fixes it by using the correct relative paths for temporary files
and index paths.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index ee8589e8c..e768c3eb2 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -66,7 +66,7 @@ test_expect_success 'mergetool crlf' ' git reset --hard ' -test_expect_failure 'mergetool in subdir' ' +test_expect_success 'mergetool in subdir' ' git checkout -b test3 branch1 cd subdir && ( test_must_fail git merge master >/dev/null 2>&1 && |