summaryrefslogtreecommitdiff
path: root/t/t3411-rebase-preserve-around-merges.sh
diff options
context:
space:
mode:
authorAndrew Wong <andrew.kw.w@gmail.com>2011-06-18 22:12:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-19 21:37:23 (GMT)
commit12bf828348922935b1d5ca10f2d829c9a64b6e41 (patch)
tree05697e971ed2816b75baf53d6da9767843c64fd8 /t/t3411-rebase-preserve-around-merges.sh
parent2c162b56f370f5c33e6a945e6922d598006c5ec4 (diff)
downloadgit-12bf828348922935b1d5ca10f2d829c9a64b6e41.zip
git-12bf828348922935b1d5ca10f2d829c9a64b6e41.tar.gz
git-12bf828348922935b1d5ca10f2d829c9a64b6e41.tar.bz2
rebase -i -p: include non-first-parent commits in todo list
Consider this graph: D---E (topic, HEAD) / / A---B---C (master) \ F (topic2) and the following three commands: 1. git rebase -i -p A 2. git rebase -i -p --onto F A 3. git rebase -i -p B Currently, (1) and (2) will pick B, D, C, and E onto A and F, respectively. However, (3) will only pick D and E onto B, but not C, which is inconsistent with (1) and (2). As a result, we cannot modify C during the interactive-rebase. The current behavior also creates a bug if we do: 4. git rebase -i -p C In (4), E is never picked. And since interactive-rebase resets "HEAD" to "onto" before picking any commits, D and E are lost after the interactive-rebase. This patch fixes the inconsistency and bug by ensuring that all children of upstream are always picked. This essentially reverts the commit: d80d6bc146232d81f1bb4bc58e5d89263fd228d4 When compiling the todo list, commits reachable from "upstream" should never be skipped under any conditions. Otherwise, we lose the ability to modify them like (3), and create a bug like (4). Two of the tests contain a scenario like (3). Since the new behavior added more commits for picking, these tests need to be updated to account for the additional pick lines. A new test has also been added for (4). Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
-rwxr-xr-xt/t3411-rebase-preserve-around-merges.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh
index 14a23cd..ace8e54 100755
--- a/t/t3411-rebase-preserve-around-merges.sh
+++ b/t/t3411-rebase-preserve-around-merges.sh
@@ -37,7 +37,7 @@ test_expect_success 'setup' '
# -- C1 --
#
test_expect_success 'squash F1 into D1' '
- FAKE_LINES="1 squash 3 2" git rebase -i -p B1 &&
+ FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&
test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&
test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&
git tag E2