diff options
Diffstat (limited to '')
| -rw-r--r-- | builtin/gc.c | 5 | ||||
| -rwxr-xr-x | t/t7900-maintenance.sh | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index bafee330a2..13bc0572a3 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -1428,8 +1428,11 @@ static int maintenance_run_tasks(struct maintenance_run_opts *opts, free(lock_path); /* Failure to daemonize is ok, we'll continue in foreground. */ - if (opts->detach > 0) + if (opts->detach > 0) { + trace2_region_enter("maintenance", "detach", the_repository); daemonize(); + trace2_region_leave("maintenance", "detach", the_repository); + } for (i = 0; !found_selected && i < TASK__COUNT; i++) found_selected = tasks[i].selected_order >= 0; diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 074eadcd1c..18e0bb29d7 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -947,11 +947,9 @@ test_expect_success '--no-detach causes maintenance to not run in background' ' git config set maintenance.loose-objects.auto 1 && git config set maintenance.incremental-repack.enabled true && - # We have no better way to check whether or not the task ran in - # the background than to verify whether it output anything. The - # next testcase checks the reverse, making this somewhat safer. - git maintenance run --no-detach >out 2>&1 && - test_line_count = 1 out + GIT_TRACE2_EVENT="$(pwd)/trace.txt" \ + git maintenance run --no-detach >out 2>&1 && + ! test_region maintenance detach trace.txt ) ' @@ -971,9 +969,9 @@ test_expect_success '--detach causes maintenance to run in background' ' # process, and by reading stdout we thus essentially wait for # that descriptor to get closed, which indicates that the child # is done, too. - output=$(git maintenance run --detach 2>&1 9>&1) && - printf "%s" "$output" >output && - test_must_be_empty output + does_not_matter=$(GIT_TRACE2_EVENT="$(pwd)/trace.txt" \ + git maintenance run --detach 9>&1) && + test_region maintenance detach trace.txt ) ' |