Merge branch 'jc/bare'

[git.git] / git-revert.sh

diff --git a/git-revert.sh b/git-revert.sh
index 0784f74c18c4a5a2c34a37c16ba1ad094cd41a06..f9843c7c8ec4c3ae7e796fec801425e85dc1c73d 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -7,9 +7,11 @@
 case "$0" in
 *-revert* )
        test -t 0 && edit=-e
+       replay=
        me=revert
        USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
 *-cherry-pick* )
+       replay=t
        edit=
        me=cherry-pick
        USAGE='[--edit] [-n] [-r] [-x] <commit-ish>'  ;;
@@ -17,8 +19,9 @@ case "$0" in
        die "What are you talking about?" ;;
 esac
 . git-sh-setup
+require_work_tree
 
-no_commit= replay=t
+no_commit=
 while case "$#" in 0) break ;; esac
 do
        case "$1" in
@@ -143,9 +146,18 @@ git-read-tree -m -u --aggressive $base $head $next &&
 result=$(git-write-tree 2>/dev/null) || {
     echo >&2 "Simple $me fails; trying Automatic $me."
     git-merge-index -o git-merge-one-file -a || {
+           mv -f .msg "$GIT_DIR/MERGE_MSG"
+           {
+               echo '
+Conflicts:
+'
+               git ls-files --unmerged |
+               sed -e 's/^[^   ]*      /       /' |
+               uniq
+           } >>"$GIT_DIR/MERGE_MSG"
            echo >&2 "Automatic $me failed.  After resolving the conflicts,"
-           echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
-           echo >&2 "and commit with 'git commit -F .msg'"
+           echo >&2 "mark the corrected paths with 'git-add <paths>'"
+           echo >&2 "and commit the result."
            case "$me" in
            cherry-pick)
                echo >&2 "You may choose to use the following when making"