Skip to content

Commit 5ee4ef8

Browse files
dschogitster
authored andcommitted
t3418: decouple test cases from a previous rebase -p test case
It is in general a good idea for regression test cases to be as independent of each other as possible (with the one exception of an initial `setup` test case, which is only a test case in Git's test suite because it does not have a notion of a fixture or setup). This patch addresses one particular instance of this principle being violated: a few test cases in t3418-rebase-continue.sh depend on a side effect of a test case that verifies a specific `rebase -p` behavior. The later test cases should, however, still succeed even if the `rebase -p` test case is skipped. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6c8fbae commit 5ee4ef8

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

t/t3418-rebase-continue.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ test_expect_success 'setup rerere database' '
177177
git checkout master &&
178178
test_commit "commit-new-file-F3" F3 3 &&
179179
test_config rerere.enabled true &&
180+
git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch &&
180181
test_must_fail git rebase -m master topic &&
181182
echo "Resolved" >F2 &&
182183
cp F2 expected-F2 &&

0 commit comments

Comments
 (0)