mirror of
https://github.com/git/git.git
synced 2024-05-28 10:26:25 +02:00
2f64da0790
In git-restore we need to free the pathspec and pathspec_from_file values from the struct checkout_opts. A simple fix could be to free them in cmd_restore, after the call to checkout_main returns, like we are doing [1][2] in the sibling function cmd_checkout. However, we can do even better. We have git-switch and git-restore, both of them spin-offs[3][4] of git-checkout. All three are implemented as thin wrappers around checkout_main. Considering this, it makes a lot of sense to do the cleanup closer to checkout_main. Move the cleanups, including the new_branch_info variable, to checkout_main. As a consequence, mark: t2070, t2071, t2072 and t6418 as leak-free. [1]9081a421a6(checkout: fix "branch info" memory leaks, 2021-11-16) [2]7ce4088ab7(parse-options: consistently allocate memory in fix_filename(), 2023-03-04) [3]d787d311db(checkout: split part of it to new command 'switch', 2019-03-29) [4]46e91b663b(checkout: split part of it to new command 'restore', 2019-04-25) Signed-off-by: Rubén Justo <rjusto@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
120 lines
3.4 KiB
Bash
Executable File
120 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git restore --patch'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./lib-patch-mode.sh
|
|
|
|
test_expect_success PERL 'setup' '
|
|
mkdir dir &&
|
|
echo parent >dir/foo &&
|
|
echo dummy >bar &&
|
|
git add bar dir/foo &&
|
|
git commit -m initial &&
|
|
test_tick &&
|
|
test_commit second dir/foo head &&
|
|
set_and_save_state bar bar_work bar_index &&
|
|
save_head
|
|
'
|
|
|
|
test_expect_success PERL 'restore -p without pathspec is fine' '
|
|
echo q >cmd &&
|
|
git restore -p <cmd
|
|
'
|
|
|
|
# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
|
|
|
|
test_expect_success PERL 'saying "n" does nothing' '
|
|
set_and_save_state dir/foo work head &&
|
|
test_write_lines n n | git restore -p &&
|
|
verify_saved_state bar &&
|
|
verify_saved_state dir/foo
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p' '
|
|
set_and_save_state dir/foo work head &&
|
|
test_write_lines n y | git restore -p &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p with staged changes' '
|
|
set_state dir/foo work index &&
|
|
test_write_lines n y | git restore -p &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo index index
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p --source=HEAD' '
|
|
set_state dir/foo work index &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git restore -p --source=HEAD &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head index
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p --source=HEAD^' '
|
|
set_state dir/foo work index &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git restore -p --source=HEAD^ &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent index
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p --source=HEAD^...' '
|
|
set_state dir/foo work index &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines n y n | git restore -p --source=HEAD^... &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent index
|
|
'
|
|
|
|
test_expect_success PERL 'git restore -p handles deletion' '
|
|
set_state dir/foo work index &&
|
|
rm dir/foo &&
|
|
test_write_lines n y | git restore -p &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo index index
|
|
'
|
|
|
|
# The idea in the rest is that bar sorts first, so we always say 'y'
|
|
# first and if the path limiter fails it'll apply to bar instead of
|
|
# dir/foo. There's always an extra 'n' to reject edits to dir/foo in
|
|
# the failure case (and thus get out of the loop).
|
|
|
|
test_expect_success PERL 'path limiting works: dir' '
|
|
set_state dir/foo work head &&
|
|
test_write_lines y n | git restore -p dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success PERL 'path limiting works: -- dir' '
|
|
set_state dir/foo work head &&
|
|
test_write_lines y n | git restore -p -- dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success PERL 'path limiting works: HEAD^ -- dir' '
|
|
set_state dir/foo work head &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines y n n | git restore -p --source=HEAD^ -- dir &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo parent head
|
|
'
|
|
|
|
test_expect_success PERL 'path limiting works: foo inside dir' '
|
|
set_state dir/foo work head &&
|
|
# the third n is to get out in case it mistakenly does not apply
|
|
test_write_lines y n n | (cd dir && git restore -p foo) &&
|
|
verify_saved_state bar &&
|
|
verify_state dir/foo head head
|
|
'
|
|
|
|
test_expect_success PERL 'none of this moved HEAD' '
|
|
verify_saved_head
|
|
'
|
|
|
|
test_done
|