Skip to content

Commit ffa4c36

Browse files
gitstergitster
committed
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
2 parents 7fa6c90 + e8c1e6c commit ffa4c36

5 files changed

Lines changed: 137 additions & 55 deletions

File tree

‎builtin/fetch.c‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,10 @@ static int fetch_refs(struct transport *transport, struct ref *ref_map)
540540
return ret;
541541
}
542542

543-
static int prune_refs(struct transport *transport, struct ref *ref_map)
543+
static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map)
544544
{
545545
int result = 0;
546-
struct ref *ref, *stale_refs = get_stale_heads(transport->remote, ref_map);
546+
struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
547547
const char *dangling_msg = dry_run
548548
? _(" (%s will become dangling)\n")
549549
: _(" (%s has become dangling)\n");
@@ -734,8 +734,31 @@ static int do_fetch(struct transport *transport,
734734
free_refs(ref_map);
735735
return 1;
736736
}
737-
if (prune)
738-
prune_refs(transport, ref_map);
737+
if (prune) {
738+
/* If --tags was specified, pretend the user gave us the canonical tags refspec */
739+
if (tags == TAGS_SET) {
740+
const char *tags_str = "refs/tags/*:refs/tags/*";
741+
struct refspec *tags_refspec, *refspec;
742+
743+
/* Copy the refspec and add the tags to it */
744+
refspec = xcalloc(ref_count + 1, sizeof(struct refspec));
745+
tags_refspec = parse_fetch_refspec(1, &tags_str);
746+
memcpy(refspec, refs, ref_count * sizeof(struct refspec));
747+
memcpy(&refspec[ref_count], tags_refspec, sizeof(struct refspec));
748+
ref_count++;
749+
750+
prune_refs(refspec, ref_count, ref_map);
751+
752+
ref_count--;
753+
/* The rest of the strings belong to fetch_one */
754+
free_refspec(1, tags_refspec);
755+
free(refspec);
756+
} else if (ref_count) {
757+
prune_refs(refs, ref_count, ref_map);
758+
} else {
759+
prune_refs(transport->remote->fetch, transport->remote->fetch_refspec_nr, ref_map);
760+
}
761+
}
739762
free_refs(ref_map);
740763

741764
/* if neither --no-tags nor --tags was specified, do automated tag
@@ -918,7 +941,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
918941
atexit(unlock_pack);
919942
refspec = parse_fetch_refspec(ref_nr, refs);
920943
exit_code = do_fetch(transport, refspec, ref_nr);
921-
free(refspec);
944+
free_refspec(ref_nr, refspec);
922945
transport_disconnect(transport);
923946
transport = NULL;
924947
return exit_code;

‎builtin/remote.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,8 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
349349
else
350350
string_list_append(&states->tracked, abbrev_branch(ref->name));
351351
}
352-
stale_refs = get_stale_heads(states->remote, fetch_map);
352+
stale_refs = get_stale_heads(states->remote->fetch,
353+
states->remote->fetch_refspec_nr, fetch_map);
353354
for (ref = stale_refs; ref; ref = ref->next) {
354355
struct string_list_item *item =
355356
string_list_append(&states->stale, abbrev_branch(ref->name));

‎remote.c‎

Lines changed: 56 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -828,59 +828,56 @@ static int match_name_with_pattern(const char *key, const char *name,
828828
return ret;
829829
}
830830

831-
char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
832-
const char *name)
831+
static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
833832
{
834833
int i;
835-
char *ret = NULL;
836-
for (i = 0; i < nr_refspec; i++) {
837-
struct refspec *refspec = refspecs + i;
838-
if (refspec->pattern) {
839-
if (match_name_with_pattern(refspec->src, name,
840-
refspec->dst, &ret))
841-
return ret;
842-
} else if (!strcmp(refspec->src, name))
843-
return strdup(refspec->dst);
844-
}
845-
return NULL;
846-
}
834+
int find_src = !query->src;
847835

848-
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
849-
{
850-
int find_src = refspec->src == NULL;
851-
char *needle, **result;
852-
int i;
836+
if (find_src && !query->dst)
837+
return error("query_refspecs: need either src or dst");
853838

854-
if (find_src) {
855-
if (!refspec->dst)
856-
return error("find_tracking: need either src or dst");
857-
needle = refspec->dst;
858-
result = &refspec->src;
859-
} else {
860-
needle = refspec->src;
861-
result = &refspec->dst;
862-
}
839+
for (i = 0; i < ref_count; i++) {
840+
struct refspec *refspec = &refs[i];
841+
const char *key = find_src ? refspec->dst : refspec->src;
842+
const char *value = find_src ? refspec->src : refspec->dst;
843+
const char *needle = find_src ? query->dst : query->src;
844+
char **result = find_src ? &query->src : &query->dst;
863845

864-
for (i = 0; i < remote->fetch_refspec_nr; i++) {
865-
struct refspec *fetch = &remote->fetch[i];
866-
const char *key = find_src ? fetch->dst : fetch->src;
867-
const char *value = find_src ? fetch->src : fetch->dst;
868-
if (!fetch->dst)
846+
if (!refspec->dst)
869847
continue;
870-
if (fetch->pattern) {
848+
if (refspec->pattern) {
871849
if (match_name_with_pattern(key, needle, value, result)) {
872-
refspec->force = fetch->force;
850+
query->force = refspec->force;
873851
return 0;
874852
}
875853
} else if (!strcmp(needle, key)) {
876854
*result = xstrdup(value);
877-
refspec->force = fetch->force;
855+
query->force = refspec->force;
878856
return 0;
879857
}
880858
}
881859
return -1;
882860
}
883861

862+
char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
863+
const char *name)
864+
{
865+
struct refspec query;
866+
867+
memset(&query, 0, sizeof(struct refspec));
868+
query.src = (char *)name;
869+
870+
if (query_refspecs(refspecs, nr_refspec, &query))
871+
return NULL;
872+
873+
return query.dst;
874+
}
875+
876+
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
877+
{
878+
return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
879+
}
880+
884881
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
885882
const char *name)
886883
{
@@ -1681,36 +1678,47 @@ struct ref *guess_remote_head(const struct ref *head,
16811678
}
16821679

16831680
struct stale_heads_info {
1684-
struct remote *remote;
16851681
struct string_list *ref_names;
16861682
struct ref **stale_refs_tail;
1683+
struct refspec *refs;
1684+
int ref_count;
16871685
};
16881686

16891687
static int get_stale_heads_cb(const char *refname,
16901688
const unsigned char *sha1, int flags, void *cb_data)
16911689
{
16921690
struct stale_heads_info *info = cb_data;
1693-
struct refspec refspec;
1694-
memset(&refspec, 0, sizeof(refspec));
1695-
refspec.dst = (char *)refname;
1696-
if (!remote_find_tracking(info->remote, &refspec)) {
1697-
if (!((flags & REF_ISSYMREF) ||
1698-
string_list_has_string(info->ref_names, refspec.src))) {
1699-
struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
1700-
hashcpy(ref->new_sha1, sha1);
1701-
}
1691+
struct refspec query;
1692+
memset(&query, 0, sizeof(struct refspec));
1693+
query.dst = (char *)refname;
1694+
1695+
if (query_refspecs(info->refs, info->ref_count, &query))
1696+
return 0; /* No matches */
1697+
1698+
/*
1699+
* If we did find a suitable refspec and it's not a symref and
1700+
* it's not in the list of refs that currently exist in that
1701+
* remote we consider it to be stale.
1702+
*/
1703+
if (!((flags & REF_ISSYMREF) ||
1704+
string_list_has_string(info->ref_names, query.src))) {
1705+
struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
1706+
hashcpy(ref->new_sha1, sha1);
17021707
}
1708+
1709+
free(query.src);
17031710
return 0;
17041711
}
17051712

1706-
struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map)
1713+
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
17071714
{
17081715
struct ref *ref, *stale_refs = NULL;
17091716
struct string_list ref_names = STRING_LIST_INIT_NODUP;
17101717
struct stale_heads_info info;
1711-
info.remote = remote;
17121718
info.ref_names = &ref_names;
17131719
info.stale_refs_tail = &stale_refs;
1720+
info.refs = refs;
1721+
info.ref_count = ref_count;
17141722
for (ref = fetch_map; ref; ref = ref->next)
17151723
string_list_append(&ref_names, ref->name);
17161724
sort_string_list(&ref_names);

‎remote.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,6 @@ struct ref *guess_remote_head(const struct ref *head,
164164
int all);
165165

166166
/* Return refs which no longer exist on remote */
167-
struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map);
167+
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map);
168168

169169
#endif

‎t/t5510-fetch.sh‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,56 @@ test_expect_success "fetch test for-merge" '
7676
cut -f -2 .git/FETCH_HEAD >actual &&
7777
test_cmp expected actual'
7878

79+
test_expect_success 'fetch --prune on its own works as expected' '
80+
cd "$D" &&
81+
git clone . prune &&
82+
cd prune &&
83+
git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
84+
85+
git fetch --prune origin &&
86+
test_must_fail git rev-parse origin/extrabranch
87+
'
88+
89+
test_expect_success 'fetch --prune with a branch name keeps branches' '
90+
cd "$D" &&
91+
git clone . prune-branch &&
92+
cd prune-branch &&
93+
git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
94+
95+
git fetch --prune origin master &&
96+
git rev-parse origin/extrabranch
97+
'
98+
99+
test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
100+
cd "$D" &&
101+
git clone . prune-namespace &&
102+
cd prune-namespace &&
103+
104+
git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
105+
git rev-parse origin/master
106+
'
107+
108+
test_expect_success 'fetch --prune --tags does not delete the remote-tracking branches' '
109+
cd "$D" &&
110+
git clone . prune-tags &&
111+
cd prune-tags &&
112+
git fetch origin refs/heads/master:refs/tags/sometag &&
113+
114+
git fetch --prune --tags origin &&
115+
git rev-parse origin/master &&
116+
test_must_fail git rev-parse somebranch
117+
'
118+
119+
test_expect_success 'fetch --prune --tags with branch does not delete other remote-tracking branches' '
120+
cd "$D" &&
121+
git clone . prune-tags-branch &&
122+
cd prune-tags-branch &&
123+
git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
124+
125+
git fetch --prune --tags origin master &&
126+
git rev-parse origin/extrabranch
127+
'
128+
79129
test_expect_success 'fetch tags when there is no tags' '
80130
81131
cd "$D" &&

0 commit comments

Comments
 (0)