Merge branch 'maint'

* maint:
for-each-ref: remove unused variable

diff --cc builtin/for-each-ref.c
index 6551e7b39b6039032852d6ec0d0dd8da0d7031dc,7557aa239eeaf94b5cd609cfd8f44ee547c04190..51798b48b54266fccd2f7b4687646d152ab70588
--- 1/builtin/for-each-ref.c
--- 2/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