git-merge-one-file: send "ERROR:" messages to stderr

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index c90b9ffd31ecfc519cb4a36eb565d416bee81b05..a93d0b4cd332ff8d5da533d5d8a353ecaf644b09 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -69,7 +69,7 @@ case "${1:-.}${2:-.}${3:-.}" in
        echo "Adding $4"
        if test -f "$4"
        then
        echo "Adding $4"
        if test -f "$4"
        then

-               echo "ERROR: untracked $4 is overwritten by the merge."
+               echo "ERROR: untracked $4 is overwritten by the merge." >&2

                exit 1
        fi
        git update-index --add --cacheinfo "$7" "$3" "$4" &&
                exit 1
        fi
        git update-index --add --cacheinfo "$7" "$3" "$4" &&


@@ -82,8 +82,8 @@ case "${1:-.}${2:-.}${3:-.}" in
 ".$3$2")
        if test "$6" != "$7"
        then
 ".$3$2")
        if test "$6" != "$7"
        then

-               echo "ERROR: File $4 added identically in both branches,"
-               echo "ERROR: but permissions conflict $6->$7."
+               echo "ERROR: File $4 added identically in both branches," >&2
+               echo "ERROR: but permissions conflict $6->$7." >&2

                exit 1
        fi
        echo "Adding $4"
                exit 1
        fi
        echo "Adding $4"


@@ -98,11 +98,11 @@ case "${1:-.}${2:-.}${3:-.}" in
 
        case ",$6,$7," in
        *,120000,*)
 
        case ",$6,$7," in
        *,120000,*)

-               echo "ERROR: $4: Not merging symbolic link changes."
+               echo "ERROR: $4: Not merging symbolic link changes." >&2

                exit 1
                ;;
        *,160000,*)
                exit 1
                ;;
        *,160000,*)

-               echo "ERROR: $4: Not merging conflicting submodule changes."
+               echo "ERROR: $4: Not merging conflicting submodule changes." >&2

                exit 1
                ;;
        esac
                exit 1
                ;;
        esac


@@ -150,14 +150,14 @@ case "${1:-.}${2:-.}${3:-.}" in
 
        if test $ret != 0
        then
 
        if test $ret != 0
        then

-               echo "ERROR: $msg in $4"
+               echo "ERROR: $msg in $4" >&2

                exit 1
        fi
        exec git update-index -- "$4"
        ;;
 
 *)
                exit 1
        fi
        exec git update-index -- "$4"
        ;;
 
 *)

-       echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
+       echo "ERROR: $4: Not handling case $1 -> $2 -> $3" >&2

        ;;
 esac
 exit 1
        ;;
 esac
 exit 1