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
git-mirror · Oct 16, 2011 · 3197bd8 · 3197bd8
2 parents d7b7dd3 + 5347a50
commit 3197bd8
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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