From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:27:08 +0000 (-0800)
Subject: Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'
X-Git-Tag: v2.3.0-rc0~63
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a558344c11014f4641d1f15a7089b2b3121441cb?hp=-c

Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'

* rt/for-each-ref-spell-tcl-as-Tcl:
for-each-ref: correct spelling of Tcl in option description
---

a558344c11014f4641d1f15a7089b2b3121441cb
diff --combined builtin/for-each-ref.c
index 603a90e29b,f8cddcec8e..f3ce004d53
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@@ -138,8 -138,10 +138,8 @@@ static int parse_atom(const char *atom
  	/* Add it in, including the deref prefix */
  	at = used_atom_cnt;
  	used_atom_cnt++;
 -	used_atom = xrealloc(used_atom,
 -			     (sizeof *used_atom) * used_atom_cnt);
 -	used_atom_type = xrealloc(used_atom_type,
 -				  (sizeof(*used_atom_type) * used_atom_cnt));
 +	REALLOC_ARRAY(used_atom, used_atom_cnt);
 +	REALLOC_ARRAY(used_atom_type, used_atom_cnt);
  	used_atom[at] = xmemdupz(atom, ep - atom);
  	used_atom_type[at] = valid_atom[i].cmp_type;
  	if (*atom == '*')
@@@ -631,12 -633,11 +631,12 @@@ static void populate_value(struct refin
  	unsigned long size;
  	const unsigned char *tagged;
  
 -	ref->value = xcalloc(sizeof(struct atom_value), used_atom_cnt);
 +	ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
  
  	if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {
  		unsigned char unused1[20];
 -		ref->symref = resolve_refdup(ref->refname, unused1, 1, NULL);
 +		ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,
 +					     unused1, NULL);
  		if (!ref->symref)
  			ref->symref = "";
  	}
@@@ -672,8 -673,7 +672,8 @@@
  		} else if (starts_with(name, "color:")) {
  			char color[COLOR_MAXLEN] = "";
  
 -			color_parse(name + 6, "--format", color);
 +			if (color_parse(name + 6, color) < 0)
 +				die(_("unable to parse format"));
  			v->s = xstrdup(color);
  			continue;
  		} else if (!strcmp(name, "flag")) {
@@@ -695,8 -695,7 +695,8 @@@
  			const char *head;
  			unsigned char sha1[20];
  
 -			head = resolve_ref_unsafe("HEAD", sha1, 1, NULL);
 +			head = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
 +						  sha1, NULL);
  			if (!strcmp(ref->refname, head))
  				v->s = "*";
  			else
@@@ -840,11 -839,6 +840,11 @@@ static int grab_single_ref(const char *
  	struct refinfo *ref;
  	int cnt;
  
 +	if (flag & REF_BAD_NAME) {
 +		  warning("ignoring ref with broken name %s", refname);
 +		  return 0;
 +	}
 +
  	if (*cb->grab_pattern) {
  		const char **pattern;
  		int namelen = strlen(refname);
@@@ -876,7 -870,8 +876,7 @@@
  	ref->flag = flag;
  
  	cnt = cb->grab_cnt;
 -	cb->grab_array = xrealloc(cb->grab_array,
 -				  sizeof(*cb->grab_array) * (cnt + 1));
 +	REALLOC_ARRAY(cb->grab_array, cnt + 1);
  	cb->grab_array[cnt++] = ref;
  	cb->grab_cnt = cnt;
  	return 0;
@@@ -1012,8 -1007,7 +1012,8 @@@ static void show_ref(struct refinfo *in
  		struct atom_value resetv;
  		char color[COLOR_MAXLEN] = "";
  
 -		color_parse("reset", "--format", color);
 +		if (color_parse("reset", color) < 0)
 +			die("BUG: couldn't parse 'reset' as a color");
  		resetv.s = color;
  		print_value(&resetv, quote_style);
  	}
@@@ -1075,7 -1069,7 +1075,7 @@@ int cmd_for_each_ref(int argc, const ch
  		OPT_BIT(0 , "python", &quote_style,
  			N_("quote placeholders suitably for python"), QUOTE_PYTHON),
  		OPT_BIT(0 , "tcl",  &quote_style,
- 			N_("quote placeholders suitably for tcl"), QUOTE_TCL),
+ 			N_("quote placeholders suitably for Tcl"), QUOTE_TCL),
  
  		OPT_GROUP(""),
  		OPT_INTEGER( 0 , "count", &maxcount, N_("show only <n> matched refs")),