X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-filter-branch.sh;h=add2c0247fa91e0f629428c295fc581f19cf85e1;hb=4cb6764227173a6483edbdad09121651bc0b01c3;hp=804a7f4bc912ab0c9c51038456d9abe4216947a5;hpb=48f36dcd7320d27a840e89fc2aa7ab11716951c6;p=git.git diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 804a7f4bc..add2c0247 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -108,9 +108,7 @@ OPTIONS_SPEC= . git-sh-setup if [ "$(is_bare_repository)" = false ]; then - git diff-files --ignore-submodules --quiet && - git diff-index --cached --quiet HEAD -- || - die "Cannot rewrite branch(es) with a dirty working directory." + require_clean_work_tree 'rewrite branches' fi tempdir=.git-rewrite