summaryrefslogtreecommitdiff
path: root/describe.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-27 22:40:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-28 01:57:27 (GMT)
commit2d9e7c9f908d0a025970a5592d47def3d77e77a9 (patch)
tree95b628ef3953c7f870439a1f11fc877d3b5ed484 /describe.c
parent4cdf78bf964912698ab33579977f21a3e0b832ed (diff)
downloadgit-2d9e7c9f908d0a025970a5592d47def3d77e77a9.zip
git-2d9e7c9f908d0a025970a5592d47def3d77e77a9.tar.gz
git-2d9e7c9f908d0a025970a5592d47def3d77e77a9.tar.bz2
git-describe: --tags and --abbrev
With --tags, not just annontated tags, but also any ref under refs/tags/ are used to name the revision. The number of digits is configurable with the --abbrev=<n> option. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'describe.c')
-rw-r--r--describe.c33
1 files changed, 27 insertions, 6 deletions
diff --git a/describe.c b/describe.c
index ba49d00..ee38f5f 100644
--- a/describe.c
+++ b/describe.c
@@ -5,9 +5,14 @@
#define SEEN (1u << 0)
-static const char describe_usage[] = "git-describe [--all] <committish>*";
+static const char describe_usage[] =
+"git-describe [--all] [--tags] [--abbrev=<n>] <committish>*";
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 struct commit_name {
@@ -50,13 +55,19 @@ static int get_name(const char *path, const unsigned char *sha1)
struct commit *commit = lookup_commit_reference_gently(sha1, 1);
if (!commit)
return 0;
+ /* If --all, then any refs are used.
+ * If --tags, then any tags are used.
+ * Otherwise only annotated tags are used.
+ */
if (!all) {
- struct object *object;
if (strncmp(path, "refs/tags/", 10))
return 0;
- object = parse_object(sha1);
- if (object->type != tag_type)
- return 0;
+ if (!tags) {
+ struct object *object;
+ object = parse_object(sha1);
+ if (object->type != tag_type)
+ return 0;
+ }
}
add_to_known_names(all ? path : path + 10, commit);
return 0;
@@ -96,7 +107,7 @@ static void describe(struct commit *cmit)
n = match(c);
if (n) {
printf("%s-g%s\n", n->path,
- find_unique_abbrev(cmit->object.sha1, 8));
+ find_unique_abbrev(cmit->object.sha1, abbrev));
return;
}
}
@@ -115,6 +126,16 @@ int main(int argc, char **argv)
all = 1;
continue;
}
+ if (!strcmp(arg, "--tags")) {
+ tags = 1;
+ continue;
+ }
+ if (!strncmp(arg, "--abbrev=", 9)) {
+ 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);