зеркало из https://github.com/microsoft/git.git
add: plug a leak on interactive_add
Plug a leak we have since 5a76aff1a6
(add: convert to use
parse_pathspec, 2013-07-14).
This leak can be triggered with:
$ git add -p anything
Fixing this leak allows us to mark as leak-free the following tests:
+ t3701-add-interactive.sh
+ t7514-commit-patch.sh
Mark them with "TEST_PASSES_SANITIZE_LEAK=true" to notice and fix
promply any new leak that may be introduced and triggered by them in the
future.
Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
ec9b74b18e
Коммит
16727404c4
|
@ -150,7 +150,7 @@ static int refresh(int verbose, const struct pathspec *pathspec)
|
|||
int interactive_add(const char **argv, const char *prefix, int patch)
|
||||
{
|
||||
struct pathspec pathspec;
|
||||
int unused;
|
||||
int unused, ret;
|
||||
|
||||
if (!git_config_get_bool("add.interactive.usebuiltin", &unused))
|
||||
warning(_("the add.interactive.useBuiltin setting has been removed!\n"
|
||||
|
@ -163,9 +163,12 @@ int interactive_add(const char **argv, const char *prefix, int patch)
|
|||
prefix, argv);
|
||||
|
||||
if (patch)
|
||||
return !!run_add_p(the_repository, ADD_P_ADD, NULL, &pathspec);
|
||||
ret = !!run_add_p(the_repository, ADD_P_ADD, NULL, &pathspec);
|
||||
else
|
||||
return !!run_add_i(the_repository, &pathspec);
|
||||
ret = !!run_add_i(the_repository, &pathspec);
|
||||
|
||||
clear_pathspec(&pathspec);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int edit_patch(int argc, const char **argv, const char *prefix)
|
||||
|
|
|
@ -4,6 +4,7 @@ test_description='add -i basic tests'
|
|||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
TEST_PASSES_SANITIZE_LEAK=true
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/lib-terminal.sh
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='hunk edit with "commit -p -m"'
|
||||
|
||||
TEST_PASSES_SANITIZE_LEAK=true
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'setup (initial)' '
|
||||
|
|
Загрузка…
Ссылка в новой задаче