mirror of
https://github.com/git/git
synced 2024-06-30 22:54:27 +00:00
refs: call branches branches
These things in refs/heads/ hierarchy are called "branches" in human parlance. Replace REF_HEADS with REF_BRANCHES to make it clearer. No end-user visible change intended at this step. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
786a3e4b8d
commit
a096e70c78
|
@ -68,7 +68,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
|
||||||
N_("path of git-upload-pack on the remote host"),
|
N_("path of git-upload-pack on the remote host"),
|
||||||
PARSE_OPT_HIDDEN },
|
PARSE_OPT_HIDDEN },
|
||||||
OPT_BIT('t', "tags", &flags, N_("limit to tags"), REF_TAGS),
|
OPT_BIT('t', "tags", &flags, N_("limit to tags"), REF_TAGS),
|
||||||
OPT_BIT('h', "heads", &flags, N_("limit to heads"), REF_HEADS),
|
OPT_BIT('h', "heads", &flags, N_("limit to heads"), REF_BRANCHES),
|
||||||
OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
|
OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
|
||||||
OPT_BOOL(0, "get-url", &get_url,
|
OPT_BOOL(0, "get-url", &get_url,
|
||||||
N_("take url.<base>.insteadOf into account")),
|
N_("take url.<base>.insteadOf into account")),
|
||||||
|
@ -100,7 +100,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
|
||||||
|
|
||||||
if (flags & REF_TAGS)
|
if (flags & REF_TAGS)
|
||||||
strvec_push(&transport_options.ref_prefixes, "refs/tags/");
|
strvec_push(&transport_options.ref_prefixes, "refs/tags/");
|
||||||
if (flags & REF_HEADS)
|
if (flags & REF_BRANCHES)
|
||||||
strvec_push(&transport_options.ref_prefixes, "refs/heads/");
|
strvec_push(&transport_options.ref_prefixes, "refs/heads/");
|
||||||
|
|
||||||
remote = remote_get(dest);
|
remote = remote_get(dest);
|
||||||
|
|
|
@ -38,8 +38,8 @@ static int check_ref(const char *name, unsigned int flags)
|
||||||
REFNAME_ALLOW_ONELEVEL))
|
REFNAME_ALLOW_ONELEVEL))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* REF_HEADS means that we want regular branch heads */
|
/* REF_BRANCHES means that we want regular branch heads */
|
||||||
if ((flags & REF_HEADS) && starts_with(name, "heads/"))
|
if ((flags & REF_BRANCHES) && starts_with(name, "heads/"))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/* REF_TAGS means that we want tags */
|
/* REF_TAGS means that we want tags */
|
||||||
|
|
2
remote.h
2
remote.h
|
@ -200,7 +200,7 @@ struct ref {
|
||||||
};
|
};
|
||||||
|
|
||||||
#define REF_NORMAL (1u << 0)
|
#define REF_NORMAL (1u << 0)
|
||||||
#define REF_HEADS (1u << 1)
|
#define REF_BRANCHES (1u << 1)
|
||||||
#define REF_TAGS (1u << 2)
|
#define REF_TAGS (1u << 2)
|
||||||
|
|
||||||
struct ref *find_ref_by_name(const struct ref *list, const char *name);
|
struct ref *find_ref_by_name(const struct ref *list, const char *name);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user