diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2009-04-29 23:40:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-29 18:38:52 -0700 |
| commit | adfd55d51bff3bfcf17c3cd40d0689fb018c14cf (patch) | |
| tree | 57418b8e6ff1c1f05536f759c4845aad31cf5811 | |
| parent | 6ffd567bec439e7809ee0966556bd5e72fb78de4 (diff) | |
| download | git-adfd55d51bff3bfcf17c3cd40d0689fb018c14cf.tar.gz git-adfd55d51bff3bfcf17c3cd40d0689fb018c14cf.tar.xz | |
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>
| -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 e1eb96326..9c2c1b720 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" |