mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
e77b3da6bb
Fix a memory leak of the "clone_data_path" variable that we copy or
derive from the "struct module_clone_data" in clone_submodule(). This
code was refactored in preceding commits, but the leak has been with
us since f8eaa0ba98 (submodule--helper, module_clone: always operate
on absolute paths, 2016-03-31).
For the "else" case we don't need to xstrdup() the "clone_data->path",
and we don't need to free our own "clone_data_path". We can therefore
assign the "clone_data->path" to our own "clone_data_path" right away,
and only override it (and remember to free it!) if we need to
xstrfmt() a replacement.
In the case of the module_clone() caller it's from "argv", and doesn't
need to be free'd, and in the case of the add_submodule() caller we
get a pointer to "sm_path", which doesn't need to be directly free'd
either.
Fixing this leak makes several tests pass, so let's mark them as
passing with TEST_PASSES_SANITIZE_LEAK=true.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
159 lines
3.3 KiB
Bash
Executable file
159 lines
3.3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='verbose commit template'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
write_script "check-for-diff" <<\EOF &&
|
|
grep '^diff --git' "$1" >out
|
|
exit 0
|
|
EOF
|
|
test_set_editor "$PWD/check-for-diff"
|
|
|
|
cat >message <<'EOF'
|
|
subject
|
|
|
|
body
|
|
EOF
|
|
|
|
test_expect_success 'setup' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -F message
|
|
'
|
|
|
|
test_expect_success 'initial commit shows verbose diff' '
|
|
git commit --amend -v &&
|
|
test_line_count = 1 out
|
|
'
|
|
|
|
test_expect_success 'second commit' '
|
|
echo content modified >file &&
|
|
git add file &&
|
|
git commit -F message
|
|
'
|
|
|
|
check_message() {
|
|
git log -1 --pretty=format:%s%n%n%b >actual &&
|
|
test_cmp "$1" actual
|
|
}
|
|
|
|
test_expect_success 'verbose diff is stripped out' '
|
|
git commit --amend -v &&
|
|
check_message message &&
|
|
test_line_count = 1 out
|
|
'
|
|
|
|
test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
|
|
git config diff.mnemonicprefix true &&
|
|
git commit --amend -v &&
|
|
check_message message &&
|
|
test_line_count = 1 out
|
|
'
|
|
|
|
cat >diff <<'EOF'
|
|
This is an example commit message that contains a diff.
|
|
|
|
diff --git c/file i/file
|
|
new file mode 100644
|
|
index 0000000..f95c11d
|
|
--- /dev/null
|
|
+++ i/file
|
|
@@ -0,0 +1 @@
|
|
+this is some content
|
|
EOF
|
|
|
|
test_expect_success 'diff in message is retained without -v' '
|
|
git commit --amend -F diff &&
|
|
check_message diff
|
|
'
|
|
|
|
test_expect_success 'diff in message is retained with -v' '
|
|
git commit --amend -F diff -v &&
|
|
check_message diff
|
|
'
|
|
|
|
test_expect_success 'submodule log is stripped out too with -v' '
|
|
git config diff.submodule log &&
|
|
git submodule add ./. sub &&
|
|
git commit -m "sub added" &&
|
|
(
|
|
cd sub &&
|
|
echo "more" >>file &&
|
|
git commit -a -m "submodule commit"
|
|
) &&
|
|
(
|
|
GIT_EDITOR=cat &&
|
|
export GIT_EDITOR &&
|
|
test_must_fail git commit -a -v 2>err
|
|
) &&
|
|
test_i18ngrep "Aborting commit due to empty commit message." err
|
|
'
|
|
|
|
test_expect_success 'verbose diff is stripped out with set core.commentChar' '
|
|
(
|
|
GIT_EDITOR=cat &&
|
|
export GIT_EDITOR &&
|
|
test_must_fail git -c core.commentchar=";" commit -a -v 2>err
|
|
) &&
|
|
test_i18ngrep "Aborting commit due to empty commit message." err
|
|
'
|
|
|
|
test_expect_success 'status does not verbose without --verbose' '
|
|
git status >actual &&
|
|
! grep "^diff --git" actual
|
|
'
|
|
|
|
test_expect_success 'setup -v -v' '
|
|
echo dirty >file
|
|
'
|
|
|
|
for i in true 1
|
|
do
|
|
test_expect_success "commit.verbose=$i and --verbose omitted" "
|
|
git -c commit.verbose=$i commit --amend &&
|
|
test_line_count = 1 out
|
|
"
|
|
done
|
|
|
|
for i in false -2 -1 0
|
|
do
|
|
test_expect_success "commit.verbose=$i and --verbose omitted" "
|
|
git -c commit.verbose=$i commit --amend &&
|
|
test_line_count = 0 out
|
|
"
|
|
done
|
|
|
|
for i in 2 3
|
|
do
|
|
test_expect_success "commit.verbose=$i and --verbose omitted" "
|
|
git -c commit.verbose=$i commit --amend &&
|
|
test_line_count = 2 out
|
|
"
|
|
done
|
|
|
|
for i in true false -2 -1 0 1 2 3
|
|
do
|
|
test_expect_success "commit.verbose=$i and --verbose" "
|
|
git -c commit.verbose=$i commit --amend --verbose &&
|
|
test_line_count = 1 out
|
|
"
|
|
|
|
test_expect_success "commit.verbose=$i and --no-verbose" "
|
|
git -c commit.verbose=$i commit --amend --no-verbose &&
|
|
test_line_count = 0 out
|
|
"
|
|
|
|
test_expect_success "commit.verbose=$i and -v -v" "
|
|
git -c commit.verbose=$i commit --amend -v -v &&
|
|
test_line_count = 2 out
|
|
"
|
|
done
|
|
|
|
test_expect_success "status ignores commit.verbose=true" '
|
|
git -c commit.verbose=true status >actual &&
|
|
! grep "^diff --git actual"
|
|
'
|
|
|
|
test_done
|