diff options
| author | Carlos Martín Nieto <cmn@elego.de> | 2011-10-15 07:04:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 21:56:13 -0700 |
| commit | ed43de6ec35dfd4c4bd33ae9b5f2ebe38282209f (patch) | |
| tree | 941a49f45a789b247840f52e74183a52a066500b /builtin/fetch.c | |
| parent | c500352e0de75db34b1a071a9e250b815d10f95b (diff) | |
| download | git-ed43de6ec35dfd4c4bd33ae9b5f2ebe38282209f.tar.gz | |
fetch: honor the user-provided refspecs when pruning refs
If the user gave us refspecs on the command line, we should use those
when deciding whether to prune a ref instead of relying on the
refspecs in the config.
Previously, running
git fetch --prune origin refs/heads/master:refs/remotes/origin/master
would delete every other ref under the origin namespace because we
were using the refspec to filter the available refs but using the
configured refspec to figure out if a ref had been deleted on the
remote. This is clearly the wrong thing to do.
Change prune_refs and get_stale_heads to simply accept a list of
references and a list of refspecs. The caller of either function needs
to decide what refspecs should be used to decide whether a ref is
stale.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 605d1bfd66..e295d97fdb 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -540,10 +540,10 @@ static int fetch_refs(struct transport *transport, struct ref *ref_map) return ret; } -static int prune_refs(struct transport *transport, struct ref *ref_map) +static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map) { int result = 0; - struct ref *ref, *stale_refs = get_stale_heads(transport->remote, ref_map); + struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map); const char *dangling_msg = dry_run ? _(" (%s will become dangling)\n") : _(" (%s has become dangling)\n"); @@ -734,8 +734,12 @@ static int do_fetch(struct transport *transport, free_refs(ref_map); return 1; } - if (prune) - prune_refs(transport, ref_map); + if (prune) { + if (ref_count) + prune_refs(refs, ref_count, ref_map); + else + prune_refs(transport->remote->fetch, transport->remote->fetch_refspec_nr, ref_map); + } free_refs(ref_map); /* if neither --no-tags nor --tags was specified, do automated tag |