projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-cvsimport: Add -A <author-conv-file> option
[git.git]
/
describe.c
diff --git
a/describe.c
b/describe.c
index
a0180f5
..
fabadb8
100644
(file)
--- a/
describe.c
+++ b/
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;
static int initialized = 0;
struct commit_name *n;
struct commit_list *list;
static int initialized = 0;
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) {
initialized = 1;
for_each_ref(get_name);
if (!initialized) {
initialized = 1;
for_each_ref(get_name);
@@
-124,10
+132,11
@@
static void describe(struct commit *cmit)
if (n) {
printf("%s-g%s\n", n->path,
find_unique_abbrev(cmit->object.sha1, abbrev));
if (n) {
printf("%s-g%s\n", n->path,
find_unique_abbrev(cmit->object.sha1, abbrev));
- break;
+ clear_commit_marks(cmit, SEEN);
+ return;
}
}
}
}
-
clear_commit_marks(cmit, SEEN
);
+
die("cannot describe '%s'", sha1_to_hex(cmit->object.sha1)
);
}
int main(int argc, char **argv)
}
int main(int argc, char **argv)
@@
-136,29
+145,27
@@
int main(int argc, char **argv)
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
for (i = 1; i < argc; 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;
- }
- if (!strcmp(arg, "--tags")) {
+ else if (!strcmp(arg, "--tags"))
tags = 1;
tags = 1;
- continue;
- }
- if (!strncmp(arg, "--abbrev=", 9)) {
+ else if (!strncmp(arg, "--abbrev=", 9)) {
abbrev = strtoul(arg + 9, NULL, 10);
if (abbrev < 4 || 40 <= abbrev)
abbrev = DEFAULT_ABBREV;
abbrev = strtoul(arg + 9, NULL, 10);
if (abbrev < 4 || 40 <= abbrev)
abbrev = DEFAULT_ABBREV;
- continue;
}
}
- if (get_sha1(arg, sha1) < 0)
- usage(describe_usage);
- cmit = lookup_commit_reference(sha1);
- if (!cmit)
+ else
usage(describe_usage);
usage(describe_usage);
- describe(cmit);
}
}
+
+ if (i == argc)
+ describe("HEAD");
+ else
+ while (i < argc)
+ describe(argv[i++]);
+
return 0;
}
return 0;
}