diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:38 -0700 |
| commit | 3197bd850b193a0d182674ab9705cf4acdc313e3 (patch) | |
| tree | ef5ff32e290de2ba0e028385fe148f9c87108bde | |
| parent | Merge branch 'jc/maint-fsck-fwrite-size-check' into maint (diff) | |
| parent | filter-branch: use require_clean_work_tree (diff) | |
| download | git-3197bd850b193a0d182674ab9705cf4acdc313e3.tar.gz git-3197bd850b193a0d182674ab9705cf4acdc313e3.zip | |
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
| -rwxr-xr-x | git-filter-branch.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 804a7f4bc9..add2c0247f 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 |