diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 19:35:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 19:35:55 (GMT) |
| commit | 9c140016508fe7329d5aa962b473d8e84af108b1 (patch) | |
| tree | 272d0bed97e4d5d269ce437cf0b8e54ab17f08dd /git-filter-branch.sh | |
| parent | c672f01c0410eef621b0df3574bfcfe433139f04 (diff) | |
| parent | 5347a50fec066845e5dfa34a53cbec1ea347641d (diff) | |
| download | git-9c140016508fe7329d5aa962b473d8e84af108b1.zip git-9c140016508fe7329d5aa962b473d8e84af108b1.tar.gz git-9c140016508fe7329d5aa962b473d8e84af108b1.tar.bz2 | |
Merge branch 'jk/filter-branch-require-clean-work-tree'
* jk/filter-branch-require-clean-work-tree:
filter-branch: use require_clean_work_tree
Diffstat (limited to 'git-filter-branch.sh')
| -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 804a7f4..add2c02 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 |