Merge branch 'maint'

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 19cab5a9a8b7ebbdf740158ba4f651457e3d53e5..674a25d27e50b421e516e8ca6e1190d04e323e9c 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -98,7 +98,7 @@ OPTIONS_SPEC=
 . git-sh-setup
 
 git diff-files --quiet &&
-       git diff-index --cached --quiet HEAD ||
+       git diff-index --cached --quiet HEAD -- ||
        die "Cannot rewrite branch(es) with a dirty working directory."
 
 tempdir=.git-rewrite