Merge branch 'jk/format-patch-leakfix' into next

A memory leak in the '--base' handling of 'git format-patch' has been
plugged, and the leak-reporting of the test suite when running under a
TAP harness has been improved.

* jk/format-patch-leakfix:
  format-patch: fix leak of rev_info in prepare_bases()
  t: move LSan errors from stdout to stderr
next
Junio C Hamano 2026-07-06 15:51:49 -07:00
commit 35aff0d609
2 changed files with 4 additions and 3 deletions

View File

@ -1888,6 +1888,7 @@ static void prepare_bases(struct base_tree_info *bases,
bases->nr_patch_id++;
}
clear_commit_base(&commit_base);
release_revisions(&revs);
}

static void print_bases(struct base_tree_info *bases, FILE *file)

View File

@ -1217,14 +1217,14 @@ check_test_results_san_file_ () {
then
return
fi &&
say_color error "$(cat "$TEST_RESULTS_SAN_FILE".*)" &&
say_color >&4 error "$(cat "$TEST_RESULTS_SAN_FILE".*)" &&

if test "$test_failure" = 0
then
say "Our logs revealed a memory leak, exit non-zero!" &&
say >&4 "Our logs revealed a memory leak, exit non-zero!" &&
invert_exit_code=t
else
say "Our logs revealed a memory leak..."
say >&4 "Our logs revealed a memory leak..."
fi
}