diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-03-20 10:03:14 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-29 10:46:48 -0700 |
| commit | 76ea235891c08e43226391cceaca8be056a1f803 (patch) | |
| tree | 96b2209eb6d010dc8c3bdca2cc6c85f9e67027e2 /t | |
| parent | rebase --root: stop assuming squash_onto is unset (diff) | |
| download | tgif-76ea235891c08e43226391cceaca8be056a1f803.tar.xz | |
rebase -i --keep-empty: don't prune empty commits
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
pruned by --cherry-pick. Fix this by using --cherry-mark instead of
--cherry-pick and keeping the commits that are empty or are not marked
as cherry-picks.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3421-rebase-topology-linear.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh index 68fe2003ef..52fc6885e5 100755 --- a/t/t3421-rebase-topology-linear.sh +++ b/t/t3421-rebase-topology-linear.sh @@ -215,7 +215,7 @@ test_run_rebase () { } test_run_rebase success '' test_run_rebase failure -m -test_run_rebase failure -i +test_run_rebase success -i test_run_rebase failure -p # m |