From: Junio C Hamano Date: Mon, 30 Dec 2013 20:27:01 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.9-rc0~44 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44484662d83de2ae98d04738ec43d4dea1f859a8;p=git Merge branch 'maint' * maint: for-each-ref: remove unused variable --- 44484662d83de2ae98d04738ec43d4dea1f859a8 diff --cc builtin/for-each-ref.c index 6551e7b39b,7557aa239e..51798b48b5 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@@ -92,8 -89,7 +92,8 @@@ static struct */ static const char **used_atom; static cmp_type *used_atom_type; - static int used_atom_cnt, sort_atom_limit, need_tagged, need_symref; + static int used_atom_cnt, need_tagged, need_symref; +static int need_color_reset_at_eol; /* * Used to parse format string and sort specifiers