Skip to content
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.

Sign up for GitHub

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

builtin/gc: fix crash when running git maintenance start #5198

Merged
merged 2 commits into from
Oct 9, 2024
Merged

builtin/gc: fix crash when running git maintenance start #5198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6138534
builtin/gc: fix crash when running `git maintenance start`
pks-t Oct 8, 2024
becfd0a
fixup! builtin/gc: fix crash when running `git maintenance start`
derrickstolee Oct 9, 2024
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
7 changes: 5 additions & 2 deletions builtin/gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1832,7 +1832,7 @@ static const char *get_extra_launchctl_strings(void) {
* | Input | Output |
* | *cmd | return code | *out | *is_available |
* +-------+-------------+-------------------+---------------+
* | "foo" | false | NULL | (unchanged) |
* | "foo" | false | "foo" (allocated) | (unchanged) |
* +-------+-------------+-------------------+---------------+
*
* GIT_TEST_MAINT_SCHEDULER set to “foo:./mock_foo.sh,bar:./mock_bar.sh”
Expand All @@ -1850,8 +1850,11 @@ static int get_schedule_cmd(const char *cmd, int *is_available, char **out)
struct string_list_item *item;
struct string_list list = STRING_LIST_INIT_NODUP;

if (!testing)
if (!testing) {
if (out)
*out = xstrdup(cmd);
return 0;
}

if (is_available)
*is_available = 0;
Expand Down
16 changes: 16 additions & 0 deletions t/t7900-maintenance.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,22 @@ test_expect_success !MINGW 'register and unregister with regex metacharacters' '
maintenance.repo "$(pwd)/$META"
'

test_expect_success !MINGW,!DARWIN 'start without GIT_TEST_MAINT_SCHEDULER' '
test_when_finished "rm -rf crontab.log script repo" &&
mkdir script &&
write_script script/crontab <<-EOF &&
echo "\$*" >>"$(pwd)"/crontab.log
EOF
git init repo &&
(
cd repo &&
sane_unset GIT_TEST_MAINT_SCHEDULER &&
PATH="$(pwd)/../script:$PATH" git maintenance start --scheduler=crontab
) &&
test_grep -- -l crontab.log &&
test_grep -- git_cron_edit_tmp crontab.log
'

test_expect_success 'start --scheduler=<scheduler>' '
test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
test_grep "unrecognized --scheduler argument" err &&
Expand Down
6 changes: 6 additions & 0 deletions t/test-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,6 +1715,12 @@ case $uname_s in
test_set_prereq GREP_STRIPS_CR
test_set_prereq WINDOWS
;;
*Darwin*)
test_set_prereq POSIXPERM
test_set_prereq BSLASHPSPEC
test_set_prereq EXECKEEPSPID
test_set_prereq DARWIN
;;
*)
test_set_prereq POSIXPERM
test_set_prereq BSLASHPSPEC
Expand Down
Loading