projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HTTP cleanup
[git.git]
/
describe.c
diff --git
a/describe.c
b/describe.c
index
fabadb8
..
8a9cd5d
100644
(file)
--- a/
describe.c
+++ b/
describe.c
@@
-11,7
+11,6
@@
static const char describe_usage[] =
static int all = 0; /* Default to annotated tags only */
static int tags = 0; /* But allow any tags if --tags is specified */
static int all = 0; /* Default to annotated tags only */
static int tags = 0; /* But allow any tags if --tags is specified */
-#define DEFAULT_ABBREV 8 /* maybe too many */
static int abbrev = DEFAULT_ABBREV;
static int names = 0, allocs = 0;
static int abbrev = DEFAULT_ABBREV;
static int names = 0, allocs = 0;
@@
-98,7
+97,7
@@
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(char *arg)
+static void describe(char *arg
, int last_one
)
{
unsigned char sha1[20];
struct commit *cmit;
{
unsigned char sha1[20];
struct commit *cmit;
@@
-106,11
+105,11
@@
static void describe(char *arg)
static int initialized = 0;
struct commit_name *n;
static int initialized = 0;
struct commit_name *n;
- if (get_sha1(arg, sha1)
< 0
)
-
usage(describe_usage
);
+ if (get_sha1(arg, sha1))
+
die("Not a valid object name %s", arg
);
cmit = lookup_commit_reference(sha1);
if (!cmit)
cmit = lookup_commit_reference(sha1);
if (!cmit)
-
usage(describe_usag
e);
+
die("%s is not a valid '%s' object", arg, commit_typ
e);
if (!initialized) {
initialized = 1;
if (!initialized) {
initialized = 1;
@@
-132,7
+131,8
@@
static void describe(char *arg)
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));
- clear_commit_marks(cmit, SEEN);
+ if (!last_one)
+ clear_commit_marks(cmit, SEEN);
return;
}
}
return;
}
}
@@
-154,7
+154,7
@@
int main(int argc, char **argv)
tags = 1;
else if (!strncmp(arg, "--abbrev=", 9)) {
abbrev = strtoul(arg + 9, NULL, 10);
tags = 1;
else if (!strncmp(arg, "--abbrev=", 9)) {
abbrev = strtoul(arg + 9, NULL, 10);
- if (abbrev <
4
|| 40 <= abbrev)
+ if (abbrev <
MINIMUM_ABBREV
|| 40 <= abbrev)
abbrev = DEFAULT_ABBREV;
}
else
abbrev = DEFAULT_ABBREV;
}
else
@@
-162,10
+162,12
@@
int main(int argc, char **argv)
}
if (i == argc)
}
if (i == argc)
- describe("HEAD");
+ describe("HEAD"
, 1
);
else
else
- while (i < argc)
- describe(argv[i++]);
+ while (i < argc) {
+ describe(argv[i], (i == argc - 1));
+ i++;
+ }
return 0;
}
return 0;
}