Thread (61 messages) 61 messages, 6 authors, 2016-06-15

Re: [PATCH v2 4/7] add tests for rebasing root

flat view

From: Johannes Sixt <hidden>
Date: 2016-06-15 22:57:29

Am 5/29/2013 8:39, schrieb Martin von Zweigbergk:
quoted hunk ↗ jump to hunk
+test_run_rebase () {
+	result=$1
+	shift
+	test_expect_$result "rebase $* --onto --root with merge-base does not go to root" "
+		reset_rebase &&
+		git rebase $* --onto m --root g &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'c g' m..
Here you check the outcome. There is no explicit check whether the rebase
attempted to replay a and b. But that check is implicit: If a or b were
attempted to replay, the rebase would have been interrupted with "no new
changes". Right?
quoted hunk ↗ jump to hunk
+	"
+}
+
+test_run_rebase success ''
+test_run_rebase success -m
+test_run_rebase success -i
+test_run_rebase failure -p
Just curious: Does the last one fail because the result is not correct or
because it does go to the root?

-- Hannes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help