[PATCH v6 09/15] rebase --rebase-merges: add test for --keep-empty
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Apr 10, 2018, 12:30 UTC
- Message-ID
- <4e12058ce815a4b6c780c0c907f819861459be1d.1523362469.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1523362469.git.johannes.schindelin@gmx.de>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
If there are empty commits on the left hand side of $upstream...HEAD then the empty commits on the right hand side that we want to keep are being pruned.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> --- t/t3421-rebase-topology-linear.sh | 1 + 1 file changed, 1 insertion(+)
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh index 68fe2003ef5..fbae5dab7e2 100755 --- a/t/t3421-rebase-topology-linear.sh +++ b/t/t3421-rebase-topology-linear.sh @@ -217,6 +217,7 @@ test_run_rebase success '' test_run_rebase failure -m test_run_rebase failure -i test_run_rebase failure -p +test_run_rebase success --rebase-merges # m # /
-- 2.17.0.windows.1.4.g7e4058d72e3