diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-10-31 21:02:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 03:27:30 +0100 |
| commit | 5ee4ef8bda516406b0c13df517895321764ad8e4 (patch) | |
| tree | c57420ab9d11468144a8490eaf268017189ce03f /t/t3418-rebase-continue.sh | |
| parent | t3404: decouple some test cases from outcomes of previous test cases (diff) | |
| download | git-5ee4ef8bda516406b0c13df517895321764ad8e4.tar.xz git-5ee4ef8bda516406b0c13df517895321764ad8e4.zip | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 25099d715c..031e3d8ddb 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -177,6 +177,7 @@ test_expect_success 'setup rerere database' ' git checkout master && test_commit "commit-new-file-F3" F3 3 && test_config rerere.enabled true && + git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch && test_must_fail git rebase -m master topic && echo "Resolved" >F2 && cp F2 expected-F2 && |