From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Wed, 25 Apr 2018 12:29:14 +0000 (+0200)
Subject: rebase --rebase-merges: add test for --keep-empty
X-Git-Tag: v2.18.0-rc0~48^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/24293359ccf8a7bc2ac68a9b9bf61d6b59c873ad

rebase --rebase-merges: add test for --keep-empty

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index b078f93046..e7438ad06a 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 success -m
 test_run_rebase success -i
 test_run_rebase failure -p
+test_run_rebase success --rebase-merges
 
 #       m
 #      /