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 /t/t9700 | |
parent | filter-branch: Fix fatal error on bare repositories (diff) | |
download | tgif-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>
Diffstat (limited to 't/t9700')
0 files changed, 0 insertions, 0 deletions