[PATCH] rebase -i continue: Don't skip submodule only commits

John Keeping· Apr 7, 2012, 10:20 UTC · lore

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>
---
 git-rebase--interactive.sh    |    2 +-
 t/t3404-rebase-interactive.sh |   30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

Show changes to 2 files +31 −1

git-rebase--interactive.sh, t/t3404-rebase-interactive.sh

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 5812222..4546749 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -672,7 +672,7 @@ rearrange_squash () {
 case "$action" in
 continue)
 	# do we have anything to commit?
-	if git diff-index --cached --quiet --ignore-submodules HEAD --
+	if git diff-index --cached --quiet HEAD --
 	then
 		: Nothing to commit -- skip this
 	else
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index b981572..7fd2127 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -624,8 +624,38 @@ test_expect_success 'submodule rebase -i' '
 	FAKE_LINES="1 squash 2 3" git rebase -i A
 '
 
+test_expect_success 'submodule conflict setup' '
+	git tag submodule-base &&
+	git checkout HEAD^ &&
+	(
+		cd sub && git checkout HEAD^ && echo 4 >elif &&
+		git add elif && git commit -m "submodule conflict"
+	) &&
+	git add sub &&
+	test_tick &&
+	git commit -m "Conflict in submodule" &&
+	git tag submodule-topic
+'
+
+test_expect_success 'rebase -i continue with only submodule staged' '
+	test_must_fail git rebase -i submodule-base &&
+	git add sub &&
+	git rebase --continue &&
+	test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
+'
+
+test_expect_success 'rebase -i continue with unstaged submodule' '
+	git checkout submodule-topic &&
+	git reset --hard &&
+	test_must_fail git rebase -i submodule-base &&
+	git reset &&
+	git rebase --continue &&
+	test $(git rev-parse submodule-base) = $(git rev-parse HEAD)
+'
+
 test_expect_success 'avoid unnecessary reset' '
 	git checkout master &&
+	git reset --hard &&
 	test-chmtime =123456789 file3 &&
 	git update-index --refresh &&
 	HEAD=$(git rev-parse HEAD) &&

-- 
1.7.8.5

Junio C Hamano· Apr 9, 2012, 22:09 UTC · re: John Keeping · lore

Re: [PATCH] rebase -i continue: Don't skip submodule only commits

John Keeping <john@keeping.me.uk> writes:

Show 15 quoted lines

> 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>
> ---

Very well explained and sensible.

Jens Lehmann· Apr 11, 2012, 18:23 UTC · re: Junio C Hamano · lore

Re: [PATCH] rebase -i continue: Don't skip submodule only commits

Am 10.04.2012 00:09, schrieb Junio C Hamano:

Show 19 quoted lines

> John Keeping <john@keeping.me.uk> writes:
> 
>> 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>
>> ---
> 
> Very well explained and sensible.

An obvious Ack from me and many thanks to John for providing the test cases I didn't find the time to write!

patchrebase -i continue: Don't skip submodule only commits