From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Nov 2011 22:51:01 +0000 (-0700)
Subject: Merge branch 'cn/fetch-prune' into maint
X-Git-Tag: v1.7.7.2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ffa4c364f4ec090438de48a986f02cdeb302b46c?ds=inline;hp=-c

Merge branch 'cn/fetch-prune' into maint

* cn/fetch-prune:
fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
fetch: honor the user-provided refspecs when pruning refs
remote: separate out the remote_find_tracking logic into query_refspecs
t5510: add tests for fetch --prune
fetch: free all the additional refspecs
---

ffa4c364f4ec090438de48a986f02cdeb302b46c
diff --combined builtin/remote.c
index b25dfb4422,de52367927..e1285becff
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@@ -349,7 -349,8 +349,8 @@@ static int get_ref_states(const struct 
  		else
  			string_list_append(&states->tracked, abbrev_branch(ref->name));
  	}
- 	stale_refs = get_stale_heads(states->remote, fetch_map);
+ 	stale_refs = get_stale_heads(states->remote->fetch,
+ 				     states->remote->fetch_refspec_nr, fetch_map);
  	for (ref = stale_refs; ref; ref = ref->next) {
  		struct string_list_item *item =
  			string_list_append(&states->stale, abbrev_branch(ref->name));
@@@ -570,7 -571,7 +571,7 @@@ static int read_remote_branches(const c
  	unsigned char orig_sha1[20];
  	const char *symref;
  
 -	strbuf_addf(&buf, "refs/remotes/%s", rename->old);
 +	strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
  	if (!prefixcmp(refname, buf.buf)) {
  		item = string_list_append(rename->remote_branches, xstrdup(refname));
  		symref = resolve_ref(refname, orig_sha1, 1, &flag);
@@@ -621,11 -622,10 +622,11 @@@ static int mv(int argc, const char **ar
  		OPT_END()
  	};
  	struct remote *oldremote, *newremote;
 -	struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT;
 +	struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT,
 +		old_remote_context = STRBUF_INIT;
  	struct string_list remote_branches = STRING_LIST_INIT_NODUP;
  	struct rename_info rename;
 -	int i;
 +	int i, refspec_updated = 0;
  
  	if (argc != 3)
  		usage_with_options(builtin_remote_rename_usage, options);
@@@ -660,25 -660,15 +661,25 @@@
  	strbuf_addf(&buf, "remote.%s.fetch", rename.new);
  	if (git_config_set_multivar(buf.buf, NULL, NULL, 1))
  		return error("Could not remove config section '%s'", buf.buf);
 +	strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old);
  	for (i = 0; i < oldremote->fetch_refspec_nr; i++) {
  		char *ptr;
  
  		strbuf_reset(&buf2);
  		strbuf_addstr(&buf2, oldremote->fetch_refspec[i]);
 -		ptr = strstr(buf2.buf, rename.old);
 -		if (ptr)
 -			strbuf_splice(&buf2, ptr-buf2.buf, strlen(rename.old),
 -					rename.new, strlen(rename.new));
 +		ptr = strstr(buf2.buf, old_remote_context.buf);
 +		if (ptr) {
 +			refspec_updated = 1;
 +			strbuf_splice(&buf2,
 +				      ptr-buf2.buf + strlen(":refs/remotes/"),
 +				      strlen(rename.old), rename.new,
 +				      strlen(rename.new));
 +		} else
 +			warning("Not updating non-default fetch respec\n"
 +				"\t%s\n"
 +				"\tPlease update the configuration manually if necessary.",
 +				buf2.buf);
 +
  		if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
  			return error("Could not append '%s'", buf.buf);
  	}
@@@ -696,9 -686,6 +697,9 @@@
  		}
  	}
  
 +	if (!refspec_updated)
 +		return 0;
 +
  	/*
  	 * First remove symrefs, then rename the rest, finally create
  	 * the new symrefs.