diff options
| author | Elijah Newren <newren@gmail.com> | 2021-12-09 05:08:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-09 21:33:13 (GMT) |
| commit | bc3ae46b420f58dfe2bfd87714dca096a043d554 (patch) | |
| tree | fcdead9833944f8fecae5e2a3c2cd1271c7c0732 /t/t2501-cwd-empty.sh | |
| parent | c65744e7d7f512f3666da5964f0ace90325dd94a (diff) | |
| download | git-bc3ae46b420f58dfe2bfd87714dca096a043d554.zip git-bc3ae46b420f58dfe2bfd87714dca096a043d554.tar.gz git-bc3ae46b420f58dfe2bfd87714dca096a043d554.tar.bz2 | |
rebase: do not attempt to remove startup_info->original_cwd
Since rebase spawns a `checkout` subprocess, make sure we run that from
the startup_info->original_cwd directory, so that the checkout process
knows to protect that directory.
Acked-by: Derrick Stolee <stolee@gmail.com>
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2501-cwd-empty.sh')
| -rwxr-xr-x | t/t2501-cwd-empty.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2501-cwd-empty.sh b/t/t2501-cwd-empty.sh index b118239..52335a8 100755 --- a/t/t2501-cwd-empty.sh +++ b/t/t2501-cwd-empty.sh @@ -166,11 +166,11 @@ test_expect_success 'cherry-pick fails if cwd needs to be removed' ' ' test_expect_success 'rebase does not clean cwd incidentally' ' - test_incidental_dir_removal failure git rebase reverted + test_incidental_dir_removal success git rebase reverted ' test_expect_success 'rebase fails if cwd needs to be removed' ' - test_required_dir_removal failure git rebase fd_conflict + test_required_dir_removal success git rebase fd_conflict ' test_expect_success 'revert does not clean cwd incidentally' ' |