[PATCH] filter-branch: do not consider diverging submodules a 'dirty worktree'
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Feb 4, 2009, 14:40 UTC
- Message-ID
- <alpine.DEB.1.00.0902041540130.10279@pacific.mpi-cbg.de>
- In-Reply-To
- <cover.1233758410u.git.johannes.schindelin@gmx.de>
As filter-branch could not care less about submodules' actual contents, it does not make sense to check if the checked-out submodules are up-to-date before running filter-branch. So do not do it.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- git-filter-branch.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 8cbce4e..066f9c3 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -108,8 +108,8 @@ OPTIONS_SPEC= . git-sh-setup if [ "$(is_bare_repository)" = false ]; then - git diff-files --quiet && - git diff-index --cached --quiet HEAD -- || + git diff-files --ignore-submodules --quiet && + git diff-index --ignore-submodules --cached --quiet HEAD -- || die "Cannot rewrite branch(es) with a dirty working directory." fi
-- 1.6.1.2.582.g3fdd5