Clarify kind of conflict in merge-one-file helper

Not as verbose as the recursive merge driver, but better still.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index e1eb9632660146396a0b5f3f2a410d8cb027ff9d..9c2c1b7202462370509a7bdb391982ae32564bd6 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -113,6 +113,10 @@ case "${1:-.}${2:-.}${3:-.}" in
        src1=`git-unpack-file $2`
        git merge-file "$src1" "$orig" "$src2"
        ret=$?
        src1=`git-unpack-file $2`
        git merge-file "$src1" "$orig" "$src2"
        ret=$?

+       msg=
+       if [ $ret -ne 0 ]; then
+               msg='content conflict'
+       fi

 
        # Create the working tree file, using "our tree" version from the
        # index, and then store the result of the merge.
 
        # Create the working tree file, using "our tree" version from the
        # index, and then store the result of the merge.


@@ -120,7 +124,10 @@ case "${1:-.}${2:-.}${3:-.}" in
        rm -f -- "$orig" "$src1" "$src2"
 
        if [ "$6" != "$7" ]; then
        rm -f -- "$orig" "$src1" "$src2"
 
        if [ "$6" != "$7" ]; then

-               echo "ERROR: Permissions conflict: $5->$6,$7."
+               if [ -n "$msg" ]; then
+                       msg="$msg, "
+               fi
+               msg="${msg}permissions conflict: $5->$6,$7"

                ret=1
        fi
        if [ "$1" = '' ]; then
                ret=1
        fi
        if [ "$1" = '' ]; then


@@ -128,7 +135,7 @@ case "${1:-.}${2:-.}${3:-.}" in
        fi
 
        if [ $ret -ne 0 ]; then
        fi
 
        if [ $ret -ne 0 ]; then

-               echo "ERROR: Merge conflict in $4"
+               echo "ERROR: $msg in $4"

                exit 1
        fi
        exec git update-index -- "$4"
                exit 1
        fi
        exec git update-index -- "$4"