Refactored merge options into separate merge-options.txt.

diff --git a/git-revert.sh b/git-revert.sh
index 722c4f755af5ea07981712d8abf6d6eed81c5d56..dfd914cf561c10f92ef2f3207446800de70c4834 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -56,9 +56,12 @@ t)
                die "Your index file is unmerged."
        ;;
 *)
-       check_clean_tree || die "Cannot run $me from a dirty tree."
        head=$(git-rev-parse --verify HEAD) ||
                die "You do not have a valid HEAD"
+       files=$(git-diff-index --cached --name-only $head) || exit
+       if [ "$files" ]; then
+               die "Dirty index: cannot $me (dirty: $files)"
+       fi
        ;;
 esac