diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-04-25 12:29:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-26 03:28:43 (GMT) |
| commit | a9be29c9817067128a2818a609450db6e6722ffd (patch) | |
| tree | db5306af5ae81aa94f77645fdccfbeb198dd445d /t/t3430-rebase-merges.sh | |
| parent | 24293359ccf8a7bc2ac68a9b9bf61d6b59c873ad (diff) | |
| download | git-a9be29c9817067128a2818a609450db6e6722ffd.zip git-a9be29c9817067128a2818a609450db6e6722ffd.tar.gz git-a9be29c9817067128a2818a609450db6e6722ffd.tar.bz2 | |
sequencer: make refs generated by the `label` command worktree-local
This allows for rebases to be run in parallel in separate worktrees
(think: interrupted in the middle of one rebase, being asked to perform
a different rebase, adding a separate worktree just for that job).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3430-rebase-merges.sh')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index 5f0febb..9685378 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -176,4 +176,18 @@ test_expect_success 'with a branch tip that was cherry-picked already' ' EOF ' +test_expect_success 'refs/rewritten/* is worktree-local' ' + git worktree add wt && + cat >wt/script-from-scratch <<-\EOF && + label xyz + exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || : + exec git rev-parse --verify refs/rewritten/xyz >b + EOF + + test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" && + git -C wt rebase -i HEAD && + test_must_be_empty wt/a && + test_cmp_rev HEAD "$(cat wt/b)" +' + test_done |