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 /git-mergetool.sh | |
| parent | b9b5078ece4b22c14a36f20bd9dce88d2f350a36 (diff) | |
| download | git-ff4a18552aa48f3227e2465072951dacc34aee9b.tar.gz | |
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 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index a4855d9444..a9d2e29d45 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -13,7 +13,6 @@ SUBDIRECTORY_OK=Yes OPTIONS_SPEC= . git-sh-setup require_work_tree -prefix=$(git rev-parse --show-prefix) # Returns true if the mode reflects a symlink is_symlink () { @@ -131,7 +130,7 @@ checkout_staged_file () { tmpfile=$(expr "$(git checkout-index --temp --stage="$1" "$2")" : '\([^ ]*\) ') if test $? -eq 0 -a -n "$tmpfile" ; then - mv -- "$tmpfile" "$3" + mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3" fi } @@ -161,9 +160,9 @@ merge_file () { local_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}'` remote_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}'` - base_present && checkout_staged_file 1 "$prefix$MERGED" "$BASE" - local_present && checkout_staged_file 2 "$prefix$MERGED" "$LOCAL" - remote_present && checkout_staged_file 3 "$prefix$MERGED" "$REMOTE" + base_present && checkout_staged_file 1 "$MERGED" "$BASE" + local_present && checkout_staged_file 2 "$MERGED" "$LOCAL" + remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE" if test -z "$local_mode" -o -z "$remote_mode"; then echo "Deleted merge conflict for '$MERGED':" |