236157 (Teach git-describe how to run name-rev, 2007-05-21) introduced
`git name-rev --name-only`, with the intent of using it to implement
`git describe --contains`. According to the message, one of the primary
objectives of --name-only was to make the output of name-rev match that
of describe.
$ git describe --contains --all master
master
$ git describe --contains --all master~1
master~1
$ git describe --contains --all v1.8.3~1
v1.8.3~1
$ git describe --contains --all v1.8.3
v1.8.3^0
The last invocation unnecessarily prints a trailing "^0" (--stdin does
not suffer from this defect). Fix this.
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
builtin/name-rev.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 37207a9..8ba5d72 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -186,7 +186,14 @@ static void show_name(const struct object *obj,
if (!name_only)
printf("%s ", caller_name ? caller_name : sha1_to_hex(sha1));
name = get_rev_name(obj);
- if (name)
+
+ if (name && name_only) {
+ /* strip possible trailing ^0 from name */
+ int len = strlen(name);
+ if (len > 2 && !strcmp(name + len - 2, "^0"))
+ len -= 2;
+ printf("%.*s\n", len, name);
+ } else if (name)
printf("%s\n", name);
else if (allow_undefined)
printf("undefined\n");
--
1.8.3.2.737.gcbc076a.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html