connect: improve check for plink to reduce false positives

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index a93d0b4cd332ff8d5da533d5d8a353ecaf644b09..07dfeb8df4bf910c5c79fb4c3dd3345ba4719da0 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -18,7 +18,7 @@
 
 USAGE='<orig blob> <our blob> <their blob> <path>'
 USAGE="$USAGE <orig mode> <our mode> <their mode>"
-LONG_USAGE="Usage: git merge-one-file $USAGE
+LONG_USAGE="usage: git merge-one-file $USAGE
 
 Blob ids and modes should be empty for missing files."
 
@@ -124,9 +124,10 @@ case "${1:-.}${2:-.}${3:-.}" in
        git merge-file "$src1" "$orig" "$src2"
        ret=$?
        msg=
-       if test $ret != 0
+       if test $ret != 0 || test -z "$1"
        then
                msg='content conflict'
+               ret=1
        fi
 
        # Create the working tree file, using "our tree" version from the
@@ -143,10 +144,6 @@ case "${1:-.}${2:-.}${3:-.}" in
                msg="${msg}permissions conflict: $5->$6,$7"
                ret=1
        fi
-       if test -z "$1"
-       then
-               ret=1
-       fi
 
        if test $ret != 0
        then