зеркало из https://github.com/microsoft/git.git
rename "match_refs()" to "match_push_refs()"
Yes, there is a warning that says the function is only used by push in big red letters in front of this function, but it didn't say a more important thing it should have said: what the function is for and what it does. Rename it and document it to avoid future confusion. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
e6bcd97968
Коммит
29753cddc8
|
@ -389,7 +389,7 @@ static int get_push_ref_states(const struct ref *remote_refs,
|
|||
local_refs = get_local_heads();
|
||||
push_map = copy_ref_list(remote_refs);
|
||||
|
||||
match_refs(local_refs, &push_map, remote->push_refspec_nr,
|
||||
match_push_refs(local_refs, &push_map, remote->push_refspec_nr,
|
||||
remote->push_refspec, MATCH_REFS_NONE);
|
||||
|
||||
states->push.strdup_strings = 1;
|
||||
|
|
|
@ -509,7 +509,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
|
|||
flags |= MATCH_REFS_MIRROR;
|
||||
|
||||
/* match them up */
|
||||
if (match_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
|
||||
if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
|
||||
return -1;
|
||||
|
||||
set_ref_status_for_push(remote_refs, args.send_mirror,
|
||||
|
|
|
@ -1877,7 +1877,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
|
||||
/* match them up */
|
||||
if (match_refs(local_refs, &remote_refs,
|
||||
if (match_push_refs(local_refs, &remote_refs,
|
||||
nr_refspec, (const char **) refspec, push_all)) {
|
||||
rc = -1;
|
||||
goto cleanup;
|
||||
|
|
11
remote.c
11
remote.c
|
@ -1170,11 +1170,14 @@ static struct ref **tail_ref(struct ref **head)
|
|||
}
|
||||
|
||||
/*
|
||||
* Note. This is used only by "push"; refspec matching rules for
|
||||
* push and fetch are subtly different, so do not try to reuse it
|
||||
* without thinking.
|
||||
* Given the set of refs the local repository has, the set of refs the
|
||||
* remote repository has, and the refspec used for push, determine
|
||||
* what remote refs we will update and with what value by setting
|
||||
* peer_ref (which object is being pushed) and force (if the push is
|
||||
* forced) in elements of "dst". The function may add new elements to
|
||||
* dst (e.g. pushing to a new branch, done in match_explicit_refs).
|
||||
*/
|
||||
int match_refs(struct ref *src, struct ref **dst,
|
||||
int match_push_refs(struct ref *src, struct ref **dst,
|
||||
int nr_refspec, const char **refspec, int flags)
|
||||
{
|
||||
struct refspec *rs;
|
||||
|
|
2
remote.h
2
remote.h
|
@ -96,7 +96,7 @@ void free_refspec(int nr_refspec, struct refspec *refspec);
|
|||
char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
|
||||
const char *name);
|
||||
|
||||
int match_refs(struct ref *src, struct ref **dst,
|
||||
int match_push_refs(struct ref *src, struct ref **dst,
|
||||
int nr_refspec, const char **refspec, int all);
|
||||
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
|
||||
int force_update);
|
||||
|
|
|
@ -1033,7 +1033,7 @@ int transport_push(struct transport *transport,
|
|||
if (flags & TRANSPORT_PUSH_MIRROR)
|
||||
match_flags |= MATCH_REFS_MIRROR;
|
||||
|
||||
if (match_refs(local_refs, &remote_refs,
|
||||
if (match_push_refs(local_refs, &remote_refs,
|
||||
refspec_nr, refspec, match_flags)) {
|
||||
return -1;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче