From: Johannes Schindelin Date: Wed, 04 Feb 2009 14:40:58 GMT Subject: [PATCH] filter-branch: do not consider diverging submodules a 'dirty worktree' Message-ID: In-Reply-To: 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 --- 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