Message ID | pull.712.v2.git.git.1582059331257.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v2] t3424: new rebase testcase documenting a stat-dirty-like failure | expand |
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> t/t3424-rebase-across-mode-change.sh | 48 ++++++++++++++++++++++++++++
t3424 is already taken by en/rebase-backend topic that has been
cooking for some time by now. It seems 342? are all taken and the
next available may be t3433 perhaps (please double check with 'pu')?
On Tue, Feb 18, 2020 at 1:33 PM Junio C Hamano <gitster@pobox.com> wrote: > > "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes: > > > t/t3424-rebase-across-mode-change.sh | 48 ++++++++++++++++++++++++++++ > > t3424 is already taken by en/rebase-backend topic that has been > cooking for some time by now. It seems 342? are all taken and the > next available may be t3433 perhaps (please double check with 'pu')? Whoops, sorry about that. Will fix up.
diff --git a/t/t3424-rebase-across-mode-change.sh b/t/t3424-rebase-across-mode-change.sh new file mode 100755 index 00000000000..f11fc35c3ee --- /dev/null +++ b/t/t3424-rebase-across-mode-change.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +test_description='git rebase across mode change' + +. ./test-lib.sh + +test_expect_success 'setup' ' + mkdir DS && + >DS/whatever && + git add DS && + git commit -m base && + + git branch side1 && + git branch side2 && + + git checkout side1 && + git rm -rf DS && + test_ln_s_add unrelated DS && + git commit -m side1 && + + git checkout side2 && + >unrelated && + git add unrelated && + git commit -m commit1 && + + echo >>unrelated && + git commit -am commit2 +' + +test_expect_success 'rebase changes with the apply backend' ' + test_when_finished "git rebase --abort || true" && + git checkout -b apply-backend side2 && + git rebase side1 +' + +test_expect_failure 'rebase changes with the merge backend' ' + test_when_finished "git rebase --abort || true" && + git checkout -b merge-backend side2 && + git rebase -m side1 +' + +test_expect_success 'rebase changes with the merge backend with a delay' ' + test_when_finished "git rebase --abort || true" && + git checkout -b merge-delay-backend side2 && + git rebase -m --exec "sleep 1" side1 +' + +test_done