[PATCH 1/2] add failing test for rebase --recreate-merges --keep-empty
- From
- Phillip Wood <phillip.wood@talktalk.net>
- Date
- Mar 20, 2018, 10:11 UTC
- Message-ID
- <20180320101114.17663-2-phillip.wood@talktalk.net>
- In-Reply-To
- <20180320101114.17663-1-phillip.wood@talktalk.net>
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. This will be fixed in the next commit.
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 68fe2003ef..cb7f176f1d 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 failure --recreate-merges # m # /
-- 2.16.2