make 'git describe --all --contains' work
Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre committed
Dec 19, 2007 at 12:53 UTC
3f7701a4db4c26d37e804dc4cdd6641677ea97e8
1 file changed
+8
-6
builtin-describe.c
+8
-6
@@ -267,12 +267,14 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
267
268
if (contains) {
269
const char **args = xmalloc((4 + argc) * sizeof(char*));
270
- args[0] = "name-rev";
271
- args[1] = "--name-only";
272
- args[2] = "--tags";
273
- memcpy(args + 3, argv, argc * sizeof(char*));
274
- args[3 + argc] = NULL;
275
- return cmd_name_rev(3 + argc, args, prefix);
270
+ int i = 0;
271
+ args[i++] = "name-rev";
272
+ args[i++] = "--name-only";
273
+ if (!all)
274
+ args[i++] = "--tags";
275
+ memcpy(args + i, argv, argc * sizeof(char*));
276
+ args[i + argc] = NULL;
277
+ return cmd_name_rev(i + argc, args, prefix);
278
}
279
280
if (argc == 0) {