зеркало из https://github.com/microsoft/git.git
Merge branch 'jk/refspecs-cleanup'
Preliminary code clean-up before introducing "negative refspec". * jk/refspecs-cleanup: refspec: make sure stack refspec_item variables are zeroed refspec: fix documentation referring to refspec_item
This commit is contained in:
Коммит
cca424ba90
|
@ -478,6 +478,7 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat
|
||||||
struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
|
struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
|
||||||
struct refspec_item refspec;
|
struct refspec_item refspec;
|
||||||
|
|
||||||
|
memset(&refspec, 0, sizeof(refspec));
|
||||||
refspec.force = 0;
|
refspec.force = 0;
|
||||||
refspec.pattern = 1;
|
refspec.pattern = 1;
|
||||||
refspec.src = refspec.dst = "refs/heads/*";
|
refspec.src = refspec.dst = "refs/heads/*";
|
||||||
|
|
27
refspec.h
27
refspec.h
|
@ -4,6 +4,19 @@
|
||||||
#define TAG_REFSPEC "refs/tags/*:refs/tags/*"
|
#define TAG_REFSPEC "refs/tags/*:refs/tags/*"
|
||||||
extern const struct refspec_item *tag_refspec;
|
extern const struct refspec_item *tag_refspec;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A struct refspec_item holds the parsed interpretation of a refspec. If it will
|
||||||
|
* force updates (starts with a '+'), force is true. If it is a pattern
|
||||||
|
* (sides end with '*') pattern is true. src and dest are the two sides
|
||||||
|
* (including '*' characters if present); if there is only one side, it is src,
|
||||||
|
* and dst is NULL; if sides exist but are empty (i.e., the refspec either
|
||||||
|
* starts or ends with ':'), the corresponding side is "".
|
||||||
|
*
|
||||||
|
* remote_find_tracking(), given a remote and a struct refspec_item with either src
|
||||||
|
* or dst filled out, will fill out the other such that the result is in the
|
||||||
|
* "fetch" specification for the remote (note that this evaluates patterns and
|
||||||
|
* returns a single result).
|
||||||
|
*/
|
||||||
struct refspec_item {
|
struct refspec_item {
|
||||||
unsigned force : 1;
|
unsigned force : 1;
|
||||||
unsigned pattern : 1;
|
unsigned pattern : 1;
|
||||||
|
@ -21,20 +34,8 @@ struct refspec_item {
|
||||||
#define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH }
|
#define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A struct refspec holds the parsed interpretation of a refspec. If it will
|
* An array of strings can be parsed into a struct refspec using
|
||||||
* force updates (starts with a '+'), force is true. If it is a pattern
|
|
||||||
* (sides end with '*') pattern is true. src and dest are the two sides
|
|
||||||
* (including '*' characters if present); if there is only one side, it is src,
|
|
||||||
* and dst is NULL; if sides exist but are empty (i.e., the refspec either
|
|
||||||
* starts or ends with ':'), the corresponding side is "".
|
|
||||||
*
|
|
||||||
* An array of strings can be parsed into an array of struct refspecs using
|
|
||||||
* parse_fetch_refspec() or parse_push_refspec().
|
* parse_fetch_refspec() or parse_push_refspec().
|
||||||
*
|
|
||||||
* remote_find_tracking(), given a remote and a struct refspec with either src
|
|
||||||
* or dst filled out, will fill out the other such that the result is in the
|
|
||||||
* "fetch" specification for the remote (note that this evaluates patterns and
|
|
||||||
* returns a single result).
|
|
||||||
*/
|
*/
|
||||||
struct refspec {
|
struct refspec {
|
||||||
struct refspec_item *items;
|
struct refspec_item *items;
|
||||||
|
|
|
@ -443,6 +443,7 @@ void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int v
|
||||||
if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE)
|
if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
memset(&rs, 0, sizeof(rs));
|
||||||
rs.src = ref->name;
|
rs.src = ref->name;
|
||||||
rs.dst = NULL;
|
rs.dst = NULL;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче