summaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2012-04-07 11:20:53 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-09 15:08:18 -0700
commita6754cda4362d129738d42d2683d07d433379e99 (patch)
treedbc792393be4cb289019c8f25ed410e67c67b29f /t/t4150-am.sh
parentMerge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8 (diff)
downloadtgif-a6754cda4362d129738d42d2683d07d433379e99.tar.xz
rebase -i continue: don't skip commits that only change submodules
When git-rebase--interactive stops due to a conflict and the only change to be committed is in a submodule, the test for whether there is anything to be committed ignores the staged submodule change. This leads rebase to skip creating the commit for the change. While unstaged submodule changes should be ignored to avoid needing to update submodules during a rebase, it is safe to remove the --ignore-submodules option to diff-index because --cached ensures that it is only checking the index. This was discussed in [1] and a test is included to ensure that unstaged changes are still ignored correctly. [1] http://thread.gmane.org/gmane.comp.version-control.git/188713 Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4150-am.sh')
0 files changed, 0 insertions, 0 deletions