[PATCH v9 11/17] rebase --rebase-merges: add test for --keep-empty
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Apr 25, 2018, 12:29 UTC
- Message-ID
- <23a1e05c64edc54c15f6d22c5fd6120b3711fd2a.1524659287.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1524659287.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 b078f930462..e7438ad06ac 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 # /
-- 2.17.0.windows.1.33.gfcbb1fa0445