[PATCH v2 3/3] git-merge-one-file: revise merge error reporting
From: Kevin Bracey <hidden>
Date: 2016-06-15 22:56:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
Commit 718135e improved the merge error reporting for the resolve strategy's merge conflict and permission conflict cases, but led to a malformed "ERROR: in myfile.c" message in the case of a file added differently. This commit reverts that change, and uses an alternative approach without this flaw. Signed-off-by: Kevin Bracey <redacted> --- git-merge-one-file.sh | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 39b7799..e231d20 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh@@ -107,10 +107,12 @@ case "${1:-.}${2:-.}${3:-.}" in ;; esac + ret=0 src2=$(git-unpack-file $3) case "$1" in '') - echo "Added $4 in both, but differently." + echo "ERROR: Added $4 in both, but differently." >&2 + ret=1 orig=$(git-unpack-file $2) create_virtual_base "$orig" "$src2" ;;
@@ -124,11 +126,10 @@ case "${1:-.}${2:-.}${3:-.}" in # would confuse "merge" greatly. src1=$(git-unpack-file $2) git merge-file "$src1" "$orig" "$src2" - ret=$? - msg= - if test $ret != 0 + if test $? != 0 then - msg='content conflict' + echo "ERROR: Content conflict in $4" >&2 + ret=1 fi # Create the working tree file, using "our tree" version from the
@@ -138,21 +139,12 @@ case "${1:-.}${2:-.}${3:-.}" in if test "$6" != "$7" then - if test -n "$msg" - then - msg="$msg, " - fi - msg="${msg}permissions conflict: $5->$6,$7" - ret=1 - fi - if test -z "$1" - then + echo "ERROR: Permissions conflict: $5->$6,$7" >&2 ret=1 fi if test $ret != 0 then - echo "ERROR: $msg in $4" >&2 exit 1 fi exec git update-index -- "$4"
--
1.8.2.rc3.21.g744ac65