diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2009-04-29 21:40:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-09 07:27:39 (GMT) |
| commit | 718135e3b6b5317f763477f5b0f408d888d79a8e (patch) | |
| tree | a4f09602d6c5e5511e220b3fdd4d2027d886fe3d /git-merge-one-file.sh | |
| parent | ac9f71cf766ab1affdfc4d4c4b58238bf9c76700 (diff) | |
| download | git-718135e3b6b5317f763477f5b0f408d888d79a8e.zip git-718135e3b6b5317f763477f5b0f408d888d79a8e.tar.gz git-718135e3b6b5317f763477f5b0f408d888d79a8e.tar.bz2 | |
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>
Diffstat (limited to 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index e1eb963..9c2c1b7 100755 --- 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=$? + 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. @@ -120,7 +124,10 @@ case "${1:-.}${2:-.}${3:-.}" in 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 @@ -128,7 +135,7 @@ case "${1:-.}${2:-.}${3:-.}" in 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" |