diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:24 +0900 |
| commit | 6e31fa9cc263ee6a65123fbe47dfc87592adcfb0 (patch) | |
| tree | 35c6fc8d990203affb989e9408fdce99f75de943 /t/t3408-rebase-multi-line.sh | |
| parent | Merge branch 'pw/am-rebase-read-author-script' (diff) | |
| parent | tests: optionally skip `git rebase -p` tests (diff) | |
| download | tgif-6e31fa9cc263ee6a65123fbe47dfc87592adcfb0.tar.xz | |
Merge branch 'js/rebase-p-tests'
In preparation to the day when we can deprecate and remove the
"rebase -p", make sure we can skip and later remove tests for
it.
* js/rebase-p-tests:
tests: optionally skip `git rebase -p` tests
t3418: decouple test cases from a previous `rebase -p` test case
t3404: decouple some test cases from outcomes of previous test cases
Diffstat (limited to 't/t3408-rebase-multi-line.sh')
| -rwxr-xr-x | t/t3408-rebase-multi-line.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh index e7292f5b9b..d2bd7c17b0 100755 --- a/t/t3408-rebase-multi-line.sh +++ b/t/t3408-rebase-multi-line.sh @@ -52,7 +52,7 @@ test_expect_success rebase ' test_cmp expect actual ' -test_expect_success rebasep ' +test_expect_success REBASE_P rebasep ' git checkout side-merge && git rebase -p side && |