From 3f7701a4db4c26d37e804dc4cdd6641677ea97e8 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 19 Dec 2007 12:53:16 -0500 Subject: [PATCH] make 'git describe --all --contains' work Signed-off-by: Nicolas Pitre Signed-off-by: Junio C Hamano --- builtin-describe.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/builtin-describe.c b/builtin-describe.c index 6eeb9b5045..7a148a2c26 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) { -- 2.11.4.GIT