2 commits

Author	SHA1	Message	Date
Johannes Schindelin	db4a3f26c3	tests: mark a couple more test cases as requiring rebase -p ... The `--preserve-merges` option has been deprecated, and as a consequence we started to mark test cases that require that option to be supported, in preparation for removing that support eventually. Since we marked those test cases, a couple more crept into the test suite, and with this patch, we mark them, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2019-05-28 13:22:32 -07:00
David A. Greene	5f35900849	contrib/subtree: Add a test for subtree rebase that loses commits ... This test merges an external tree in as a subtree, makes some commits on top of it and splits it back out. In the process the added commits are lost or the rebase aborts with an internal error. The tests are marked to expect failure so that we don't forget to fix it. Signed-off-by: David A. Greene <greened@obbligato.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2016-06-28 09:21:28 -07:00