Skip to content

Commit 9af295f

Browse files
dschoGit for Windows Build Agent
authored andcommitted
monitor-components: stop looking for mimalloc updates (#6334)
As of #6231, Git for Windows does not use mimalloc anymore (because the system allocator has sprouted comparable performance in the meantime). So let's not bother looking for new versions of that project, no reaction is needed from Git for Windows' side anymore when those appear.
2 parents 07d5616 + 2db2a66 commit 9af295f

3 files changed

Lines changed: 44 additions & 3 deletions

File tree

.github/workflows/monitor-components.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ jobs:
7777
feed: https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-llvm.atom
7878
- label: innosetup
7979
feed: https://github.com/jrsoftware/issrc/tags.atom
80-
- label: mimalloc
81-
feed: https://github.com/microsoft/mimalloc/tags.atom
82-
title-pattern: ^(?!v1\.|v3\.[01]\.)
8380
fail-fast: false
8481
steps:
8582
- uses: git-for-windows/rss-to-issues@v0

refs/reftable-backend.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,8 @@ static struct ref_store *reftable_be_init(struct repository *repo,
417417

418418
reftable_set_alloc(malloc, realloc, free);
419419

420+
reftable_set_alloc(malloc, realloc, free);
421+
420422
refs_compute_filesystem_location(gitdir, payload, &is_worktree, &refdir,
421423
&ref_common_dir);
422424

t/t7502-commit-porcelain.sh

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,48 @@ test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on
642642
test_must_be_empty actual
643643
'
644644

645+
test_expect_success 'helper-editor' '
646+
647+
write_script lf-to-crlf.sh <<-\EOF
648+
sed "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&
649+
mv -f "$1".new "$1"
650+
EOF
651+
'
652+
653+
test_expect_success 'cleanup commit messages (scissors option,-F,-e, CR/LF line endings)' '
654+
655+
test_config core.editor "\"$PWD/lf-to-crlf.sh\"" &&
656+
scissors="# ------------------------ >8 ------------------------" &&
657+
658+
test_write_lines >text \
659+
"# Keep this comment" "" " $scissors" \
660+
"# Keep this comment, too" "$scissors" \
661+
"# Remove this comment" "$scissors" \
662+
"Remove this comment, too" &&
663+
664+
test_write_lines >expect \
665+
"# Keep this comment" "" " $scissors" \
666+
"# Keep this comment, too" &&
667+
668+
git commit --cleanup=scissors -e -F text --allow-empty &&
669+
git cat-file -p HEAD >raw &&
670+
sed -e "1,/^\$/d" raw >actual &&
671+
test_cmp expect actual
672+
'
673+
674+
test_expect_success 'cleanup commit messages (scissors option,-F,-e, scissors on first line, CR/LF line endings)' '
675+
676+
scissors="# ------------------------ >8 ------------------------" &&
677+
test_write_lines >text \
678+
"$scissors" \
679+
"# Remove this comment and any following lines" &&
680+
cp text /tmp/test2-text &&
681+
git commit --cleanup=scissors -e -F text --allow-empty --allow-empty-message &&
682+
git cat-file -p HEAD >raw &&
683+
sed -e "1,/^\$/d" raw >actual &&
684+
test_must_be_empty actual
685+
'
686+
645687
test_expect_success 'cleanup commit messages (strip option,-F)' '
646688
647689
echo >>negative &&

0 commit comments

Comments
 (0)