X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-revert.sh;h=dfd914cf561c10f92ef2f3207446800de70c4834;hb=e2f5f6ef6795c880a2f13ea472b96704b4a4ca94;hp=722c4f755af5ea07981712d8abf6d6eed81c5d56;hpb=a935824036dc2c5a8ef1980a4b05a12228712754;p=git.git diff --git a/git-revert.sh b/git-revert.sh index 722c4f75..dfd914cf 100755 --- 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