Permalink
Browse files

Merge branch 'jk/filter-branch-require-clean-work-tree' into maint

* jk/filter-branch-require-clean-work-tree:
  filter-branch: use require_clean_work_tree
  • Loading branch information...
2 parents d7b7dd3 + 5347a50 commit 3197bd850b193a0d182674ab9705cf4acdc313e3 @gitster gitster committed Oct 16, 2011
Showing with 1 addition and 3 deletions.
  1. +1 −3 git-filter-branch.sh
View
@@ -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

0 comments on commit 3197bd8

Please sign in to comment.