diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:24 (GMT) |
| commit | 6e31fa9cc263ee6a65123fbe47dfc87592adcfb0 (patch) | |
| tree | 35c6fc8d990203affb989e9408fdce99f75de943 /t/test-lib.sh | |
| parent | 6b2a52431b238fc3c25ea931def6e5b1cf9e78fb (diff) | |
| parent | 11aad46432b21f9779a3f303335b8e0a187f98a1 (diff) | |
| download | git-6e31fa9cc263ee6a65123fbe47dfc87592adcfb0.zip git-6e31fa9cc263ee6a65123fbe47dfc87592adcfb0.tar.gz git-6e31fa9cc263ee6a65123fbe47dfc87592adcfb0.tar.bz2 | |
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/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 47a99aa..aba66ca 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1268,3 +1268,7 @@ test_lazy_prereq CURL ' test_lazy_prereq SHA1 ' test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ' + +test_lazy_prereq REBASE_P ' + test -z "$GIT_TEST_SKIP_REBASE_P" +' |