Skip to content

Commit

Permalink
Merge pull request #1769 from gitster/kg/gc-auto-windows-workaround
Browse files Browse the repository at this point in the history
gc --auto: release pack files before auto packing
  • Loading branch information
kgybels committed Aug 1, 2018
2 parents 07e862c + 12e73a3 commit 9b68f5a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions builtin/gc.c
Expand Up @@ -612,6 +612,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
return -1;

if (!repository_format_precious_objects) {
close_all_packs(the_repository->objects);
if (run_command_v_opt(repack.argv, RUN_GIT_CMD))
return error(FAILED_RUN, repack.argv[0]);

Expand Down
2 changes: 2 additions & 0 deletions t/t5510-fetch.sh
Expand Up @@ -828,9 +828,11 @@ test_expect_success 'fetching with auto-gc does not lock up' '
test_commit test2 &&
(
cd auto-gc &&
git config fetch.unpackLimit 1 &&
git config gc.autoPackLimit 1 &&
git config gc.autoDetach false &&
GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
test_i18ngrep "Auto packing the repository" fetch.out &&
! grep "Should I try again" fetch.out
)
'
Expand Down

0 comments on commit 9b68f5a

Please sign in to comment.