From: Junio C Hamano Date: Thu, 27 Sep 2007 21:33:48 GMT Subject: Re: Mergetool generating blank files (1.5.3) Message-ID: <7vmyv7sshv.fsf@gitster.siamese.dyndns.org> In-Reply-To: <94ccbe710709271422x5d1739c2g5da961c88a4336fe@mail.gmail.com> "Kelvie Wong" writes: >> > It _could_ be just the matter of doing this, although I cannot >> > test it right now (at work and have no access to any of the >> > backends). Care to try it from a subdirectory and report >> > failure or success? Actually, it seems that mergetool can take paths arguments, and they need to be adjusted, so here is a fixed patch. --- git-mergetool.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index a0e44f7..56ec993 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -12,6 +12,8 @@ USAGE='[--tool=tool] [file to merge] ...' SUBDIRECTORY_OK=Yes . git-sh-setup require_work_tree +directory_prefix=$(git rev-parse --show-prefix) +cd_to_toplevel # Returns true if the mode reflects a symlink is_symlink () { @@ -378,7 +380,7 @@ if test $# -eq 0 ; then else while test $# -gt 0; do printf "\n" - merge_file "$1" + merge_file "$directory_prefix$1" shift done fi