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

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>
maint
Theodore Ts'o 2007-09-28 21:23:22 -04:00
parent 769f39861b
commit f6e0e55934
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-mergetool.sh
View File

@ -252,9 +252,9 @@ merge_file () {
;; ;;
emerge) emerge)
if base_present ; then 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 else
emacs -f emerge-files-command "$LOCAL" "$REMOTE" "$path" emacs -f emerge-files-command "$LOCAL" "$REMOTE" "$(basename "$path")"
fi fi
status=$? status=$?
save_backup save_backup