From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Nov 2018 13:37:24 +0000 (+0900)
Subject: Merge branch 'js/rebase-p-tests'
X-Git-Tag: v2.20.0-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6e31fa9cc263ee6a65123fbe47dfc87592adcfb0?hp=--cc

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
---

6e31fa9cc263ee6a65123fbe47dfc87592adcfb0
diff --cc t/t3418-rebase-continue.sh
index 4c3f7d8dfe,f0025c7810..0210b2ac6f
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@@ -240,17 -241,6 +241,17 @@@ test_rerere_autoupdat
  test_rerere_autoupdate -m
  GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
  test_rerere_autoupdate -i
- test_rerere_autoupdate --preserve-merges
+ test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges
 +unset GIT_SEQUENCE_EDITOR
 +
 +test_expect_success 'the todo command "break" works' '
 +	rm -f execed &&
 +	FAKE_LINES="break b exec_>execed" git rebase -i HEAD &&
 +	test_path_is_missing execed &&
 +	git rebase --continue &&
 +	test_path_is_missing execed &&
 +	git rebase --continue &&
 +	test_path_is_file execed
 +'
  
  test_done