X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase--interactive.sh;h=e9cd6fd999695daa1c5ba49835f53041d4131f3a;hb=f2dc849e9c5fe363ad089f6c3f2b7b3d79fd6a6f;hp=bf44b6af58574273df9e7f549136a735f6e549fe;hpb=25f3cd527dec9909322a0f76458a0b602de61141;p=git.git diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index bf44b6af5..e9cd6fd99 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -53,7 +53,7 @@ require_clean_work_tree () { git rev-parse --verify HEAD > /dev/null && git update-index --refresh && git diff-files --quiet && - git diff-index --cached --quiet HEAD || + git diff-index --cached --quiet HEAD -- || die "Working tree is dirty" } @@ -356,7 +356,7 @@ do git rev-parse --verify HEAD > /dev/null && git update-index --refresh && git diff-files --quiet && - ! git diff-index --cached --quiet HEAD && + ! git diff-index --cached --quiet HEAD -- && . "$DOTEST"/author-script && { test ! -f "$DOTEST"/amend || git reset --soft HEAD^ } &&