kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Charles Bailey 2009-01-30 23:20:11 +00:00 committed by Junio C Hamano
parent b9b5078ece
commit ff4a18552a
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-mergetool.sh
View File

@ -13,7 +13,6 @@ SUBDIRECTORY_OK=Yes
OPTIONS_SPEC= OPTIONS_SPEC=
. git-sh-setup . git-sh-setup
require_work_tree require_work_tree
prefix=$(git rev-parse --show-prefix)


# Returns true if the mode reflects a symlink # Returns true if the mode reflects a symlink
is_symlink () { is_symlink () {
@ -131,7 +130,7 @@ checkout_staged_file () {
tmpfile=$(expr "$(git checkout-index --temp --stage="$1" "$2")" : '\([^ ]*\) ') tmpfile=$(expr "$(git checkout-index --temp --stage="$1" "$2")" : '\([^ ]*\) ')


if test $? -eq 0 -a -n "$tmpfile" ; then if test $? -eq 0 -a -n "$tmpfile" ; then
mv -- "$tmpfile" "$3" mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
fi fi
} }


@ -161,9 +160,9 @@ merge_file () {
local_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}'` 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;}'` remote_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}'`


base_present && checkout_staged_file 1 "$prefix$MERGED" "$BASE" base_present && checkout_staged_file 1 "$MERGED" "$BASE"
local_present && checkout_staged_file 2 "$prefix$MERGED" "$LOCAL" local_present && checkout_staged_file 2 "$MERGED" "$LOCAL"
remote_present && checkout_staged_file 3 "$prefix$MERGED" "$REMOTE" remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE"


if test -z "$local_mode" -o -z "$remote_mode"; then if test -z "$local_mode" -o -z "$remote_mode"; then
echo "Deleted merge conflict for '$MERGED':" echo "Deleted merge conflict for '$MERGED':"

2
t/t7610-mergetool.sh
View File

@ -66,7 +66,7 @@ test_expect_success 'mergetool crlf' '
git reset --hard git reset --hard
' '


test_expect_failure 'mergetool in subdir' ' test_expect_success 'mergetool in subdir' '
git checkout -b test3 branch1 git checkout -b test3 branch1
cd subdir && ( cd subdir && (
test_must_fail git merge master >/dev/null 2>&1 && test_must_fail git merge master >/dev/null 2>&1 &&