diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2009-02-05 19:19:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 17:48:04 -0800 |
| commit | 26be15f09db15d2b53a13d0f184d77fb54367f33 (patch) | |
| tree | 37f40e5c4b1416ff59ecd27be5ba8c6f134905fd | |
| parent | 9273b56278e64dd47b1a96a705ddf46aeaf6afe3 (diff) | |
| download | git-26be15f09db15d2b53a13d0f184d77fb54367f33.tar.gz git-26be15f09db15d2b53a13d0f184d77fb54367f33.tar.xz | |
filter-branch: do not consider diverging submodules a 'dirty worktree'
At the end of filter-branch in a non-bare repository, the work tree is
updated with "read-tree -m -u HEAD", to carry the change forward in case
the current branch was rewritten. In order to avoid losing any local
change during this step, filter-branch refuses to work when there are
local changes in the work tree.
This "read-tree -m -u HEAD" operation does not affect what commit is
checked out in a submodule (iow, it does not touch .git/HEAD in a
submodule checkout), and checking if there is any local change to the
submodule is not useful.
Staged submodules _are_ considered to be 'dirty', however, as the
"read-tree -m -u HEAD" could result in loss of staged information
otherwise.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 56d1bd0f9..0897b5971 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 |