diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:02:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:02:56 -0800 |
| commit | c42f63671c0f09cba0c8247c4d1d8121f37798fe (patch) | |
| tree | 0455a5d2bb8b59fa72305235d831bbba0fc3206f | |
| parent | 7385a42572977c000c361aaad3e5ec066bd240ec (diff) | |
| parent | 518120e3487a00148f8001454f1e76e484442a22 (diff) | |
| download | git-c42f63671c0f09cba0c8247c4d1d8121f37798fe.tar.gz git-c42f63671c0f09cba0c8247c4d1d8121f37798fe.tar.xz | |
Merge branch 'sb/describe-long'
* sb/describe-long:
git-describe: --long shows the object name even for a tagged commit
| -rw-r--r-- | Documentation/git-describe.txt | 9 | ||||
| -rw-r--r-- | builtin-describe.c | 11 | ||||
| -rwxr-xr-x | t/t6120-describe.sh | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index fbb40a291..d9aa2f298 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -56,6 +56,15 @@ OPTIONS being employed to standard error. The tag name will still be printed to standard out. +--long:: + Always output the long format (the tag, the number of commits + and the abbreviated commit name) even when it matches a tag. + This is useful when you want to see parts of the commit object name + in "describe" output, even when the commit in question happens to be + a tagged version. Instead of just emitting the tag name, it will + describe such a commit as v1.2-0-deadbeef (0th commit since tag v1.2 + that points at object deadbeef....). + --match <pattern>:: Only consider tags matching the given pattern (can be used to avoid leaking private tags made from the repository). diff --git a/builtin-describe.c b/builtin-describe.c index 05e309f5a..2342913df 100644 --- a/builtin-describe.c +++ b/builtin-describe.c @@ -17,6 +17,7 @@ static const char * const describe_usage[] = { static int debug; /* Display lots of verbose info */ static int all; /* Default to annotated tags only */ static int tags; /* But allow any tags if --tags is specified */ +static int longformat; static int abbrev = DEFAULT_ABBREV; static int max_candidates = 10; const char *pattern = NULL; @@ -170,7 +171,11 @@ static void describe(const char *arg, int last_one) n = cmit->util; if (n) { - printf("%s\n", n->path); + if (!longformat) + printf("%s\n", n->path); + else + printf("%s-0-g%s\n", n->path, + find_unique_abbrev(cmit->object.sha1, abbrev)); return; } @@ -271,6 +276,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix) OPT_BOOLEAN(0, "debug", &debug, "debug search strategy on stderr"), OPT_BOOLEAN(0, "all", &all, "use any ref in .git/refs"), OPT_BOOLEAN(0, "tags", &tags, "use any tag in .git/refs/tags"), + OPT_BOOLEAN(0, "long", &longformat, "always use long format"), OPT__ABBREV(&abbrev), OPT_SET_INT(0, "exact-match", &max_candidates, "only output exact matches", 0), @@ -289,6 +295,9 @@ int cmd_describe(int argc, const char **argv, const char *prefix) save_commit_buffer = 0; + if (longformat && abbrev == 0) + die("--long is incompatible with --abbrev=0"); + if (contains) { const char **args = xmalloc((6 + argc) * sizeof(char*)); int i = 0; diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index ae8ee1118..a7557bdc7 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -94,4 +94,6 @@ check_describe D-* --tags HEAD^^ check_describe A-* --tags HEAD^^2 check_describe B --tags HEAD^^2^ +check_describe B-0-* --long HEAD^^2^ + test_done |