From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 27 Mar 2007 22:00:03 +0000 (-0400)
Subject: mergetool: Don't error out in the merge case where the local file is deleted
X-Git-Tag: v1.5.1~19^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ce5b6d752bf4fdc72697ef85b3589983f52d7007;p=git.git

mergetool: Don't error out in the merge case where the local file is deleted

If the file we are trying to merge resolve is in git-ls-files -u, then
skip the file existence test.  If the file isn't reported in
git-ls-files, then check to see if the file exists or not to give an
appropriate error message.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 340182335..fa301add3 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -109,14 +109,13 @@ resolve_deleted_merge () {
 merge_file () {
     path="$1"
 
-    if test ! -f "$path" ; then
-	echo "$path: file not found"
-	exit 1
-    fi
-
     f=`git-ls-files -u -- "$path"`
     if test -z "$f" ; then
-	echo "$path: file does not need merging"
+        if test ! -f "$path" ; then
+	    echo "$path: file not found"
+	else
+	    echo "$path: file does not need merging"
+	fi
 	exit 1
     fi