From: Nicolas Pitre <nico@cam.org>
Date: Wed, 19 Dec 2007 17:53:16 +0000 (-0500)
Subject: make 'git describe --all --contains' work
X-Git-Tag: v1.5.4-rc1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f7701a4db4c26d37e804dc4cdd6641677ea97e8;p=git.git

make 'git describe --all --contains' work

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-describe.c b/builtin-describe.c
index 6eeb9b504..7a148a2c2 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -267,12 +267,14 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 
 	if (contains) {
 		const char **args = xmalloc((4 + argc) * sizeof(char*));
-		args[0] = "name-rev";
-		args[1] = "--name-only";
-		args[2] = "--tags";
-		memcpy(args + 3, argv, argc * sizeof(char*));
-		args[3 + argc] = NULL;
-		return cmd_name_rev(3 + argc, args, prefix);
+		int i = 0;
+		args[i++] = "name-rev";
+		args[i++] = "--name-only";
+		if (!all)
+			args[i++] = "--tags";
+		memcpy(args + i, argv, argc * sizeof(char*));
+		args[i + argc] = NULL;
+		return cmd_name_rev(i + argc, args, prefix);
 	}
 
 	if (argc == 0) {