undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-describe: default to HEAD

Browse Source 
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:
Junio C Hamano 2006-01-11 13:57:42 -08:00
parent 0f76f52621
commit 4c34a2c555
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
describe.c
View File

@ -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;
} }