Re: Mergetool generating blank files (1.5.3)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 27, 2007, 21:41 UTC
- Message-ID
- <7vir5vss58.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <7vmyv7sshv.fsf@gitster.siamese.dyndns.org>
When mergetool is run from a subdirectory, "ls-files -u" nicely limits the output to conflicted files in that directory, but we need to give the full path to cat-file plumbing to grab the contents of stages.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
* I earlier sent one with cd_to_toplevel but I think the approach in this patch is nicer.
git-mergetool.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh index a0e44f7..3b1ec13 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -12,6 +12,7 @@ USAGE='[--tool=tool] [file to merge] ...' SUBDIRECTORY_OK=Yes . git-sh-setup require_work_tree +prefix=$(git rev-parse --show-prefix) # Returns true if the mode reflects a symlink is_symlink () { @@ -162,9 +163,9 @@ merge_file () { local_mode=`git ls-files -u -- "$path" | awk '{if ($3==2) print $1;}'` remote_mode=`git ls-files -u -- "$path" | awk '{if ($3==3) print $1;}'` - base_present && git cat-file blob ":1:$path" > "$BASE" 2>/dev/null - local_present && git cat-file blob ":2:$path" > "$LOCAL" 2>/dev/null - remote_present && git cat-file blob ":3:$path" > "$REMOTE" 2>/dev/null + base_present && git cat-file blob ":1:$prefix$path" >"$BASE" 2>/dev/null + local_present && git cat-file blob ":2:$prefix$path" >"$LOCAL" 2>/dev/null + remote_present && git cat-file blob ":3:$prefix$path" >"$REMOTE" 2>/dev/null if test -z "$local_mode" -o -z "$remote_mode"; then echo "Deleted merge conflict for '$path':"