undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch

Browse Source 
* jk/maint-gc-auto-after-fetch:
  fetch-pack: avoid repeatedly re-scanning pack directory
  fetch: run gc --auto after fetching
This commit is contained in:
Junio C Hamano 2013-01-26 19:42:09 -08:00
commit 012a1bb524
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/fetch.c
View File

@ -959,6 +959,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
struct string_list list = STRING_LIST_INIT_NODUP; struct string_list list = STRING_LIST_INIT_NODUP;
struct remote *remote; struct remote *remote;
int result = 0; int result = 0;
static const char *argv_gc_auto[] = {
"gc", "--auto", NULL,
};
packet_trace_identity("fetch"); packet_trace_identity("fetch");
@ -1026,5 +1029,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
list.strdup_strings = 1; list.strdup_strings = 1;
string_list_clear(&list, 0); string_list_clear(&list, 0);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
return result; return result;
} }

3
fetch-pack.c
View File

@ -594,6 +594,9 @@ static int everything_local(struct fetch_pack_args *args,
for (ref = *refs; ref; ref = ref->next) { for (ref = *refs; ref; ref = ref->next) {
struct object *o; struct object *o;
if (!has_sha1_file(ref->old_sha1))
continue;
o = parse_object(ref->old_sha1); o = parse_object(ref->old_sha1);
if (!o) if (!o)
continue; continue;