@matheusbsbs / matheus-bagliano / commits / 59d3f541cf
Fork 0

name-rev: avoid "^0" when unneeded

When naming by a tag, we used to add "^0" even if this was not really necessary. For example, `git name-rev de6f0def` now outputs de6f0def tags/v1.5.0.1~9 instead of de6f0def tags/v1.5.0.1^0~9 Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>

Johannes Schindelin committed Feb 20, 2007 at 01:08 UTC 59d3f541cfe48345d708330bc19d8a880c80c595
1 file changed +16 -7
builtin-name-rev.c
+16 -7
@@ -57,13 +57,17 @@ copy_data:
57 parents;
58 parents = parents->next, parent_number++) {
59 if (parent_number > 1) {
60 - char *new_name = xmalloc(strlen(tip_name)+8);
60 + int len = strlen(tip_name);
61 + char *new_name = xmalloc(len + 8);
62
63 + if (len > 2 && !strcmp(tip_name + len - 2, "^0"))
64 + len -= 2;
65 if (generation > 0)
63 - sprintf(new_name, "%s~%d^%d", tip_name,
66 + sprintf(new_name, "%.*s~%d^%d", len, tip_name,
67 generation, parent_number);
68 else
66 - sprintf(new_name, "%s^%d", tip_name, parent_number);
69 + sprintf(new_name, "%.*s^%d", len, tip_name,
70 + parent_number);
71
72 name_rev(parents->item, new_name,
73 merge_traversals + 1 , 0, 0);
@@ -119,10 +123,15 @@ static const char* get_rev_name(struct object *o)
123
124 if (!n->generation)
125 return n->tip_name;
122 -
123 - snprintf(buffer, sizeof(buffer), "%s~%d", n->tip_name, n->generation);
124 -
125 - return buffer;
126 + else {
127 + int len = strlen(n->tip_name);
128 + if (len > 2 && !strcmp(n->tip_name + len - 2, "^0"))
129 + len -= 2;
130 + snprintf(buffer, sizeof(buffer), "%.*s~%d", len, n->tip_name,
131 + n->generation);
132 +
133 + return buffer;
134 + }
135 }
136
137 int cmd_name_rev(int argc, const char **argv, const char *prefix)