mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
git-describe: default to HEAD
This is based on the patch by Andreas Ericsson, but done slightly differently, preferring to have separate loops -- one for options and then arguments. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
0f76f52621
commit
4c34a2c555
38
describe.c
38
describe.c
|
@ -98,12 +98,20 @@ static int compare_names(const void *_a, const void *_b)
|
||||||
return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
|
return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void describe(struct commit *cmit)
|
static void describe(char *arg)
|
||||||
{
|
{
|
||||||
|
unsigned char sha1[20];
|
||||||
|
struct commit *cmit;
|
||||||
struct commit_list *list;
|
struct commit_list *list;
|
||||||
static int initialized = 0;
|
static int initialized = 0;
|
||||||
struct commit_name *n;
|
struct commit_name *n;
|
||||||
|
|
||||||
|
if (get_sha1(arg, sha1) < 0)
|
||||||
|
usage(describe_usage);
|
||||||
|
cmit = lookup_commit_reference(sha1);
|
||||||
|
if (!cmit)
|
||||||
|
usage(describe_usage);
|
||||||
|
|
||||||
if (!initialized) {
|
if (!initialized) {
|
||||||
initialized = 1;
|
initialized = 1;
|
||||||
for_each_ref(get_name);
|
for_each_ref(get_name);
|
||||||
|
@ -136,29 +144,27 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
const char *arg = argv[i];
|
const char *arg = argv[i];
|
||||||
unsigned char sha1[20];
|
|
||||||
struct commit *cmit;
|
|
||||||
|
|
||||||
if (!strcmp(arg, "--all")) {
|
if (*arg != '-')
|
||||||
|
break;
|
||||||
|
else if (!strcmp(arg, "--all"))
|
||||||
all = 1;
|
all = 1;
|
||||||
continue;
|
else if (!strcmp(arg, "--tags"))
|
||||||
}
|
|
||||||
if (!strcmp(arg, "--tags")) {
|
|
||||||
tags = 1;
|
tags = 1;
|
||||||
continue;
|
else if (!strncmp(arg, "--abbrev=", 9)) {
|
||||||
}
|
|
||||||
if (!strncmp(arg, "--abbrev=", 9)) {
|
|
||||||
abbrev = strtoul(arg + 9, NULL, 10);
|
abbrev = strtoul(arg + 9, NULL, 10);
|
||||||
if (abbrev < 4 || 40 <= abbrev)
|
if (abbrev < 4 || 40 <= abbrev)
|
||||||
abbrev = DEFAULT_ABBREV;
|
abbrev = DEFAULT_ABBREV;
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
if (get_sha1(arg, sha1) < 0)
|
else
|
||||||
usage(describe_usage);
|
usage(describe_usage);
|
||||||
cmit = lookup_commit_reference(sha1);
|
|
||||||
if (!cmit)
|
|
||||||
usage(describe_usage);
|
|
||||||
describe(cmit);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (i == argc)
|
||||||
|
describe("HEAD");
|
||||||
|
else
|
||||||
|
while (i < argc)
|
||||||
|
describe(argv[i++]);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue