From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:39:08 +0000 (-0700)
Subject: Merge branch 'jk/maint-1.6.0-trace-argv'
X-Git-Tag: v1.6.4-rc0~141
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2beba6beb0074afac988594539572865fb37a00f;hp=-c;p=git.git

Merge branch 'jk/maint-1.6.0-trace-argv'

* jk/maint-1.6.0-trace-argv:
  fix GIT_TRACE segfault with shell-quoted aliases

Conflicts:
	alias.c
---

2beba6beb0074afac988594539572865fb37a00f
diff --combined alias.c
index e687fe54c,4f4d0141c..372b7d809
--- a/alias.c
+++ b/alias.c
@@@ -27,7 -27,7 +27,7 @@@ int split_cmdline(char *cmdline, const 
  	int src, dst, count = 0, size = 16;
  	char quoted = 0;
  
 -	*argv = xmalloc(sizeof(char*) * size);
 +	*argv = xmalloc(sizeof(char *) * size);
  
  	/* split alias_string */
  	(*argv)[count++] = cmdline;
@@@ -38,10 -38,7 +38,7 @@@
  			while (cmdline[++src]
  					&& isspace(cmdline[src]))
  				; /* skip */
- 			if (count >= size) {
- 				size += 16;
- 				*argv = xrealloc(*argv, sizeof(char *) * size);
- 			}
+ 			ALLOC_GROW(*argv, count+1, size);
  			(*argv)[count++] = cmdline + dst;
  		} else if (!quoted && (c == '\'' || c == '"')) {
  			quoted = c;
@@@ -72,6 -69,9 +69,9 @@@
  		return error("unclosed quote");
  	}
  
+ 	ALLOC_GROW(*argv, count+1, size);
+ 	(*argv)[count] = NULL;
+ 
  	return count;
  }