diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:46:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:46:50 -0700 |
| commit | 532b74b2104bd00cbaa99e726e6a7b8997f48744 (patch) | |
| tree | 0405c0e59f424878a3d4acc693c7ddac46bf3ab1 | |
| parent | c26901a8ff8aa25a584551ee946516e8dc8a704a (diff) | |
| parent | 26be15f09db15d2b53a13d0f184d77fb54367f33 (diff) | |
| download | git-532b74b2104bd00cbaa99e726e6a7b8997f48744.tar.gz | |
Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1
* js/maint-1.6.1-filter-branch-submodule:
filter-branch: do not consider diverging submodules a 'dirty worktree'
| -rwxr-xr-x | git-filter-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 56d1bd0f99..0897b5971a 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -98,7 +98,7 @@ OPTIONS_SPEC= . git-sh-setup if [ "$(is_bare_repository)" = false ]; then - git diff-files --quiet && + git diff-files --ignore-submodules --quiet && git diff-index --cached --quiet HEAD -- || die "Cannot rewrite branch(es) with a dirty working directory." fi |