From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:42 +0000 (-0700)
Subject: Merge branch 'nd/fetch-multi-gc-once'
X-Git-Tag: v2.23.0-rc0~69
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/892d3fb71e75849811c038b9fcaf17188a9ccf5d?ds=inline;hp=-c

Merge branch 'nd/fetch-multi-gc-once'

"git fetch" that grabs from a group of remotes learned to run the
auto-gc only once at the very end.

* nd/fetch-multi-gc-once:
fetch: only run 'gc' once when fetching multiple remotes
---

892d3fb71e75849811c038b9fcaf17188a9ccf5d
diff --combined builtin/fetch.c
index c9b92b1e52,6a3c507897..667f2cec7b
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -48,6 -48,7 +48,7 @@@ static int prune_tags = -1; /* unspecif
  
  static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
  static int progress = -1;
+ static int enable_auto_gc = 1;
  static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
  static int max_children = 1;
  static enum transport_family family;
@@@ -169,6 -170,8 +170,8 @@@ static struct option builtin_fetch_opti
  	OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
  			N_("report that we have only objects reachable from this object")),
  	OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ 	OPT_BOOL(0, "auto-gc", &enable_auto_gc,
+ 		 N_("run 'gc --auto' after fetching")),
  	OPT_END()
  };
  
@@@ -239,7 -242,6 +242,7 @@@ static int will_fetch(struct ref **head
  struct refname_hash_entry {
  	struct hashmap_entry ent; /* must be the first member */
  	struct object_id oid;
 +	int ignore;
  	char refname[FLEX_ARRAY];
  };
  
@@@ -288,11 -290,6 +291,11 @@@ static int refname_hash_exists(struct h
  	return !!hashmap_get_from_hash(map, strhash(refname), refname);
  }
  
 +static void clear_item(struct refname_hash_entry *item)
 +{
 +	item->ignore = 1;
 +}
 +
  static void find_non_local_tags(const struct ref *refs,
  				struct ref **head,
  				struct ref ***tail)
@@@ -325,7 -322,7 +328,7 @@@
  			    !will_fetch(head, ref->old_oid.hash) &&
  			    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
  			    !will_fetch(head, item->oid.hash))
 -				oidclr(&item->oid);
 +				clear_item(item);
  			item = NULL;
  			continue;
  		}
@@@ -339,7 -336,7 +342,7 @@@
  		if (item &&
  		    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
  		    !will_fetch(head, item->oid.hash))
 -			oidclr(&item->oid);
 +			clear_item(item);
  
  		item = NULL;
  
@@@ -360,7 -357,7 +363,7 @@@
  	if (item &&
  	    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
  	    !will_fetch(head, item->oid.hash))
 -		oidclr(&item->oid);
 +		clear_item(item);
  
  	/*
  	 * For all the tags in the remote_refs_list,
@@@ -368,21 -365,19 +371,21 @@@
  	 */
  	for_each_string_list_item(remote_ref_item, &remote_refs_list) {
  		const char *refname = remote_ref_item->string;
 +		struct ref *rm;
  
  		item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname);
  		if (!item)
  			BUG("unseen remote ref?");
  
  		/* Unless we have already decided to ignore this item... */
 -		if (!is_null_oid(&item->oid)) {
 -			struct ref *rm = alloc_ref(item->refname);
 -			rm->peer_ref = alloc_ref(item->refname);
 -			oidcpy(&rm->old_oid, &item->oid);
 -			**tail = rm;
 -			*tail = &rm->next;
 -		}
 +		if (item->ignore)
 +			continue;
 +
 +		rm = alloc_ref(item->refname);
 +		rm->peer_ref = alloc_ref(item->refname);
 +		oidcpy(&rm->old_oid, &item->oid);
 +		**tail = rm;
 +		*tail = &rm->next;
  	}
  	hashmap_free(&remote_refs, 1);
  	string_list_clear(&remote_refs_list, 0);
@@@ -1432,7 -1427,7 +1435,7 @@@ static int fetch_multiple(struct string
  			return errcode;
  	}
  
- 	argv_array_pushl(&argv, "fetch", "--append", NULL);
+ 	argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);
  	add_options_to_argv(&argv);
  
  	for (i = 0; i < list->nr; i++) {
@@@ -1680,13 -1675,15 +1683,15 @@@ int cmd_fetch(int argc, const char **ar
  
  	string_list_clear(&list, 0);
  
 -	close_all_packs(the_repository->objects);
 +	close_object_store(the_repository->objects);
  
- 	argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
- 	if (verbosity < 0)
- 		argv_array_push(&argv_gc_auto, "--quiet");
- 	run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
- 	argv_array_clear(&argv_gc_auto);
+ 	if (enable_auto_gc) {
+ 		argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
+ 		if (verbosity < 0)
+ 			argv_array_push(&argv_gc_auto, "--quiet");
+ 		run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
+ 		argv_array_clear(&argv_gc_auto);
+ 	}
  
  	return result;
  }