Skip to content

Apply some v2.48 regression bugfixes #5376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 39 commits into from
Jan 23, 2025
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
49edce4
show-index: the short help should say the command reads from its input
gitster Dec 20, 2024
0ad3d65
object-file: fix race in object collision check
pks-t Dec 30, 2024
c1acf1a
object-file: rename variables in `check_collision()`
pks-t Jan 6, 2025
cfae50e
object-file: don't special-case missing source file in collision check
pks-t Jan 6, 2025
d7fcbe2
object-file: retry linking file into place when occluding file vanishes
pks-t Jan 6, 2025
8d24d56
test-lib: invert return value of check_test_results_san_file_empty
peff Jan 7, 2025
b9a9df9
test-lib: simplify lsan results check
peff Jan 7, 2025
164a251
test-lib: add a few comments to LSan log checking
peff Jan 7, 2025
0b43274
credential-cache: respect authtype capability
hickford Jan 9, 2025
447cdec
fetch set_head: fix non-mirror remotes in bare repositories
ferdinandyb Jan 12, 2025
71e19a0
object-name: fix resolution of object names containing curly braces
newren Jan 13, 2025
191f0c8
object-name: be more strict in parsing describe-like output
newren Jan 13, 2025
bc67b4a
reftable: write correct max_update_index to header
KarthikNayak Jan 15, 2025
5e58db6
ref-filter: move ahead-behind bases into used_atom
rscharfe Jan 18, 2025
7ee4fd1
ref-filter: move is-base tip to used_atom
rscharfe Jan 18, 2025
c5490ce
ref-filter: remove ref_format_clear()
rscharfe Jan 18, 2025
9c83589
Merge branch 'jk/lsan-race-ignore-false-positive'
gitster Jan 21, 2025
aec5e0e
Merge branch 'ps/object-collision-check'
gitster Jan 17, 2025
75bc40d
bswap.h: squelch potential sparse -Wcast-truncate warnings
gitster Jan 19, 2025
b3c9b61
packfile: factor out --pack_header argument parsing
peff Jan 19, 2025
56c5e82
parse_pack_header_option(): avoid unaligned memory writes
peff Jan 19, 2025
7215d58
index-pack, unpack-objects: use get_be32() for reading pack header
peff Jan 19, 2025
f2d9cf9
index-pack, unpack-objects: use skip_prefix to avoid magic number
peff Jan 19, 2025
7c73034
Merge branch 'jk/pack-header-parse-alignment-fix'
gitster Jan 21, 2025
369aa54
Merge branch 'en/object-name-with-funny-refname-fix'
gitster Jan 17, 2025
a5dd349
Merge branch 'kn/reflog-migration-fix'
gitster Jan 17, 2025
6638779
refs: mark `ref_transaction_update_reflog()` as static
KarthikNayak Jan 21, 2025
a89e12d
refs: use 'uint64_t' for 'ref_update.index'
KarthikNayak Jan 21, 2025
148560f
reftable: prevent 'update_index' changes after adding records
KarthikNayak Jan 21, 2025
fff597d
Merge branch 'kn/reflog-migration-fix-followup'
gitster Jan 21, 2025
120b274
Merge branch 'rs/ref-filter-used-atoms-value-fix'
gitster Jan 21, 2025
1804320
Merge branch 'bf/fetch-set-head-fix' into jch
gitster Jan 21, 2025
b37dd62
Merge branch 'jc/show-index-h-update'
gitster Jan 21, 2025
9b7de7e
Merge branch 'mh/credential-cache-authtype-request-fix'
gitster Jan 21, 2025
1edca76
trace2: prevent segfault on config collection where no value specified
ad-murray Jan 10, 2025
b7a9905
grep: prevent `^$` false match at end of file
peff Jan 13, 2025
86d0c30
update-ref: do set reflog's `old_oid`
peff Jan 21, 2025
14ed4ad
Merge branch 'fixes-from-the-git-mailing-list'
dscho Jan 22, 2025
290ad15
fixup! reftable: write correct max_update_index to header
KarthikNayak Jan 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test-lib: simplify lsan results check
We want to know if there are any leaks logged by LSan in the results
directory, so we run "find" on the containing directory and pipe it to
xargs. We can accomplish the same thing by just globbing in the shell
and passing the result to grep, which has a few advantages:

  - it's one fewer process to run

  - we can glob on the TEST_RESULTS_SAN_FILE pattern, which is what we
    checked at the beginning of the function, and is the same glob used
    to show the logs in check_test_results_san_file_

  - this correctly handles the case where TEST_OUTPUT_DIRECTORY has a
    space in it. For example doing:

       mkdir "/tmp/foo bar"
       TEST_OUTPUT_DIRECTORY="/tmp/foo bar" make SANITIZE=leak test

    would yield a lot of:

      grep: /tmp/foo: No such file or directory
      grep: bar/test-results/t0006-date.leak/trace.test-tool.582311: No such file or directory

    when there are leaks. We could do the same thing with "xargs
    --null", but that isn't portable.

We are now subject to command-line length limits, but that is also true
of the globbing cat used to show the logs themselves. This hasn't been a
problem in practice.

We do need to use "grep -s" for the case that the glob does not expand
(i.e., there are not any log files at all). This option is in POSIX, and
has been used in t7407 for several years without anybody complaining.
This also also naturally handles the case where the surrounding
directory has already been removed (in which case there are likewise no
files!), dropping the need to comment about it.

Signed-off-by: Jeff King <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
peff authored and gitster committed Jan 7, 2025
commit b9a9df93a3f5580c7f7b8cc099aad1c204ced8a4
7 changes: 1 addition & 6 deletions t/test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1172,12 +1172,7 @@ test_atexit_handler () {
check_test_results_san_file_has_entries_ () {
test -z "$TEST_RESULTS_SAN_FILE" && return 1

# stderr piped to /dev/null because the directory may have
# been "rmdir"'d already.
find "$TEST_RESULTS_SAN_DIR" \
-type f \
-name "$TEST_RESULTS_SAN_FILE_PFX.*" 2>/dev/null |
xargs grep ^DEDUP_TOKEN |
grep -s ^DEDUP_TOKEN "$TEST_RESULTS_SAN_FILE".* |
grep -qv sanitizer::GetThreadStackTopAndBottom
}

Expand Down