summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-09-28 21:23:22 -0400
committerTheodore Ts'o <tytso@mit.edu>2007-09-28 21:23:22 -0400
commitf6e0e559340af6e300b63da061fa05ff07e3d6f6 (patch)
tree1d4275f2675e618cb31043def600524ff5d5545a /git-mergetool.sh
parent769f39861b73a374f116fcb913e5ff276fe92751 (diff)
downloadgit-f6e0e559340af6e300b63da061fa05ff07e3d6f6.tar.gz
mergetool: fix emerge when running in a subdirectory
Only pass the basename of the output filename when to emerge, since emerge interprets non-absolute pathnames relative to the containing directory of the output buffer. Thanks to Kelvie Wong for pointing this out. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index e00682a513..a92019a1ed 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -252,9 +252,9 @@ merge_file () {
;;
emerge)
if base_present ; then
- emacs -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$path"
+ emacs -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$(basename "$path")"
else
- emacs -f emerge-files-command "$LOCAL" "$REMOTE" "$path"
+ emacs -f emerge-files-command "$LOCAL" "$REMOTE" "$(basename "$path")"
fi
status=$?
save_backup