Skip to content

Commit 9c14001

Browse files
committed
Merge branch 'jk/filter-branch-require-clean-work-tree'
* jk/filter-branch-require-clean-work-tree: filter-branch: use require_clean_work_tree
2 parents c672f01 + 5347a50 commit 9c14001

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

git-filter-branch.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ OPTIONS_SPEC=
108108
. git-sh-setup
109109

110110
if [ "$(is_bare_repository)" = false ]; then
111-
git diff-files --ignore-submodules --quiet &&
112-
git diff-index --cached --quiet HEAD -- ||
113-
die "Cannot rewrite branch(es) with a dirty working directory."
111+
require_clean_work_tree 'rewrite branches'
114112
fi
115113

116114
tempdir=.git-rewrite

0 commit comments

Comments
 (0)