summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorKevin Bracey <kevin@bracey.fi>2013-03-24 14:26:24 +0200
committerJunio C Hamano <gitster@pobox.com>2013-03-25 10:50:31 -0700
commitd401acf7036cf01d93d138239edf87a59f9627b4 (patch)
tree4c5ae176b6795567f28d672c38cf88383930c6d5 /git-merge-one-file.sh
parent333ea38db95c77fad8b18daa80bbf0f96fee556c (diff)
downloadgit-d401acf7036cf01d93d138239edf87a59f9627b4.tar.gz
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>
Diffstat (limited to 'git-merge-one-file.sh')
-rwxr-xr-xgit-merge-one-file.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index c90b9ffd31..a93d0b4cd3 100755
--- 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 "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" &&
@@ -82,8 +82,8 @@ case "${1:-.}${2:-.}${3:-.}" in
".$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"
@@ -98,11 +98,11 @@ case "${1:-.}${2:-.}${3:-.}" in
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,*)
- echo "ERROR: $4: Not merging conflicting submodule changes."
+ echo "ERROR: $4: Not merging conflicting submodule changes." >&2
exit 1
;;
esac
@@ -150,14 +150,14 @@ case "${1:-.}${2:-.}${3:-.}" in
if test $ret != 0
then
- echo "ERROR: $msg in $4"
+ echo "ERROR: $msg in $4" >&2
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