mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
56d26ade97
When '--no-sort' is passed to 'for-each-ref', 'tag', and 'branch', the printed refs are still sorted by ascending refname. Change the handling of sort options in these commands so that '--no-sort' to truly disables sorting. '--no-sort' does not disable sorting in these commands is because their option parsing does not distinguish between "the absence of '--sort'" (and/or values for tag.sort & branch.sort) and '--no-sort'. Both result in an empty 'sorting_options' string list, which is parsed by 'ref_sorting_options()' to create the 'struct ref_sorting *' for the command. If the string list is empty, 'ref_sorting_options()' interprets that as "the absence of '--sort'" and returns the default ref sorting structure (equivalent to "refname" sort). To handle '--no-sort' properly while preserving the "refname" sort in the "absence of --sort'" case, first explicitly add "refname" to the string list *before* parsing options. This alone doesn't actually change any behavior, since 'compare_refs()' already falls back on comparing refnames if two refs are equal w.r.t all other sort keys. Now that the string list is populated by default, '--no-sort' is the only way to empty the 'sorting_options' string list. Update 'ref_sorting_options()' to return a NULL 'struct ref_sorting *' if the string list is empty, and add a condition to 'ref_array_sort()' to skip the sort altogether if the sort structure is NULL. Note that other functions using 'struct ref_sorting *' do not need any changes because they already ignore NULL values. Finally, remove the condition around sorting in 'ls-remote', since it's no longer necessary. Unlike 'for-each-ref' et. al., it does *not* do any sorting by default. This default is preserved by simply leaving its sort key string list empty before parsing options; if no additional sort keys are set, 'struct ref_sorting *' is NULL and sorting is skipped. Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
163 lines
4.6 KiB
C
163 lines
4.6 KiB
C
#include "builtin.h"
|
|
#include "gettext.h"
|
|
#include "hex.h"
|
|
#include "transport.h"
|
|
#include "pkt-line.h"
|
|
#include "ref-filter.h"
|
|
#include "remote.h"
|
|
#include "refs.h"
|
|
#include "parse-options.h"
|
|
#include "wildmatch.h"
|
|
|
|
static const char * const ls_remote_usage[] = {
|
|
N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
|
|
" [--symref] [<repository> [<patterns>...]]"),
|
|
NULL
|
|
};
|
|
|
|
/*
|
|
* Is there one among the list of patterns that match the tail part
|
|
* of the path?
|
|
*/
|
|
static int tail_match(const char **pattern, const char *path)
|
|
{
|
|
const char *p;
|
|
char *pathbuf;
|
|
|
|
if (!pattern)
|
|
return 1; /* no restriction */
|
|
|
|
pathbuf = xstrfmt("/%s", path);
|
|
while ((p = *(pattern++)) != NULL) {
|
|
if (!wildmatch(p, pathbuf, 0)) {
|
|
free(pathbuf);
|
|
return 1;
|
|
}
|
|
}
|
|
free(pathbuf);
|
|
return 0;
|
|
}
|
|
|
|
int cmd_ls_remote(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *dest = NULL;
|
|
unsigned flags = 0;
|
|
int get_url = 0;
|
|
int quiet = 0;
|
|
int status = 0;
|
|
int show_symref_target = 0;
|
|
const char *uploadpack = NULL;
|
|
const char **pattern = NULL;
|
|
struct transport_ls_refs_options transport_options =
|
|
TRANSPORT_LS_REFS_OPTIONS_INIT;
|
|
int i;
|
|
struct string_list server_options = STRING_LIST_INIT_DUP;
|
|
|
|
struct remote *remote;
|
|
struct transport *transport;
|
|
const struct ref *ref;
|
|
struct ref_array ref_array;
|
|
struct ref_sorting *sorting;
|
|
struct string_list sorting_options = STRING_LIST_INIT_DUP;
|
|
|
|
struct option options[] = {
|
|
OPT__QUIET(&quiet, N_("do not print remote URL")),
|
|
OPT_STRING(0, "upload-pack", &uploadpack, N_("exec"),
|
|
N_("path of git-upload-pack on the remote host")),
|
|
{ OPTION_STRING, 0, "exec", &uploadpack, N_("exec"),
|
|
N_("path of git-upload-pack on the remote host"),
|
|
PARSE_OPT_HIDDEN },
|
|
OPT_BIT('t', "tags", &flags, N_("limit to tags"), REF_TAGS),
|
|
OPT_BIT('h', "heads", &flags, N_("limit to heads"), REF_HEADS),
|
|
OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
|
|
OPT_BOOL(0, "get-url", &get_url,
|
|
N_("take url.<base>.insteadOf into account")),
|
|
OPT_REF_SORT(&sorting_options),
|
|
OPT_SET_INT_F(0, "exit-code", &status,
|
|
N_("exit with exit code 2 if no matching refs are found"),
|
|
2, PARSE_OPT_NOCOMPLETE),
|
|
OPT_BOOL(0, "symref", &show_symref_target,
|
|
N_("show underlying ref in addition to the object pointed by it")),
|
|
OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
|
|
OPT_END()
|
|
};
|
|
|
|
memset(&ref_array, 0, sizeof(ref_array));
|
|
|
|
argc = parse_options(argc, argv, prefix, options, ls_remote_usage,
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
dest = argv[0];
|
|
|
|
packet_trace_identity("ls-remote");
|
|
|
|
if (argc > 1) {
|
|
int i;
|
|
CALLOC_ARRAY(pattern, argc);
|
|
for (i = 1; i < argc; i++) {
|
|
pattern[i - 1] = xstrfmt("*/%s", argv[i]);
|
|
}
|
|
}
|
|
|
|
if (flags & REF_TAGS)
|
|
strvec_push(&transport_options.ref_prefixes, "refs/tags/");
|
|
if (flags & REF_HEADS)
|
|
strvec_push(&transport_options.ref_prefixes, "refs/heads/");
|
|
|
|
remote = remote_get(dest);
|
|
if (!remote) {
|
|
if (dest)
|
|
die("bad repository '%s'", dest);
|
|
die("No remote configured to list refs from.");
|
|
}
|
|
if (!remote->url_nr)
|
|
die("remote %s has no configured URL", dest);
|
|
|
|
if (get_url) {
|
|
printf("%s\n", *remote->url);
|
|
return 0;
|
|
}
|
|
|
|
transport = transport_get(remote, NULL);
|
|
if (uploadpack)
|
|
transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
|
|
if (server_options.nr)
|
|
transport->server_options = &server_options;
|
|
|
|
ref = transport_get_remote_refs(transport, &transport_options);
|
|
if (ref) {
|
|
int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
|
|
repo_set_hash_algo(the_repository, hash_algo);
|
|
}
|
|
|
|
if (!dest && !quiet)
|
|
fprintf(stderr, "From %s\n", *remote->url);
|
|
for ( ; ref; ref = ref->next) {
|
|
struct ref_array_item *item;
|
|
if (!check_ref_type(ref, flags))
|
|
continue;
|
|
if (!tail_match(pattern, ref->name))
|
|
continue;
|
|
item = ref_array_push(&ref_array, ref->name, &ref->old_oid);
|
|
item->symref = xstrdup_or_null(ref->symref);
|
|
}
|
|
|
|
sorting = ref_sorting_options(&sorting_options);
|
|
ref_array_sort(sorting, &ref_array);
|
|
|
|
for (i = 0; i < ref_array.nr; i++) {
|
|
const struct ref_array_item *ref = ref_array.items[i];
|
|
if (show_symref_target && ref->symref)
|
|
printf("ref: %s\t%s\n", ref->symref, ref->refname);
|
|
printf("%s\t%s\n", oid_to_hex(&ref->objectname), ref->refname);
|
|
status = 0; /* we found something */
|
|
}
|
|
|
|
ref_sorting_release(sorting);
|
|
ref_array_clear(&ref_array);
|
|
if (transport_disconnect(transport))
|
|
status = 1;
|
|
transport_ls_refs_options_release(&transport_options);
|
|
return status;
|
|
}
|