Merge branch 'jk/filter-branch-require-clean-work-tree'
* jk/filter-branch-require-clean-work-tree: filter-branch: use require_clean_work_tree
This commit is contained in:
commit
9c14001650
@ -108,9 +108,7 @@ OPTIONS_SPEC=
|
|||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
|
|
||||||
if [ "$(is_bare_repository)" = false ]; then
|
if [ "$(is_bare_repository)" = false ]; then
|
||||||
git diff-files --ignore-submodules --quiet &&
|
require_clean_work_tree 'rewrite branches'
|
||||||
git diff-index --cached --quiet HEAD -- ||
|
|
||||||
die "Cannot rewrite branch(es) with a dirty working directory."
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tempdir=.git-rewrite
|
tempdir=.git-rewrite
|
||||||
|
Loading…
Reference in New Issue
Block a user