diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-03-27 18:00:03 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 12:22:48 -0400 |
| commit | ce5b6d752bf4fdc72697ef85b3589983f52d7007 (patch) | |
| tree | dfd384f1023e1b29335a8f3600ea545cdeefc2d8 /git-mergetool.sh | |
| parent | 20fa04ea6bad985d74bd2c0180701f1c69272801 (diff) | |
| download | git-ce5b6d752bf4fdc72697ef85b3589983f52d7007.tar.gz git-ce5b6d752bf4fdc72697ef85b3589983f52d7007.tar.xz | |
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>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 11 |
1 files changed, 5 insertions, 6 deletions
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 |