Merge branch 'ps/contains-id-error-message' into next

"git tag --contains no-such-commit" gave a full list of options
after giving an error message.

* ps/contains-id-error-message:
parse-options: remove the unused parse_opt_commits() function
ref-filter: mark a file-local symbol as static

diff --combined ref-filter.c
index f375e7670a38770d5c201c54dd36da78501daa48,ed993d32d8aa9319a98f4e821d21d9dea38e1607..69bf7b587ef8b3fd2c8fd18011b2c04e2e1e4995
--- 1/ref-filter.c
--- 2/ref-filter.c
+++ b/ref-filter.c
@@@ -529,12 -529,12 +529,12 @@@ static void end_align_handler(struct re
  
  static void align_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
  {
 -      struct ref_formatting_stack *new;
 +      struct ref_formatting_stack *new_stack;
  
        push_stack_element(&state->stack);
 -      new = state->stack;
 -      new->at_end = end_align_handler;
 -      new->at_end_data = &atomv->atom->u.align;
 +      new_stack = state->stack;
 +      new_stack->at_end = end_align_handler;
 +      new_stack->at_end_data = &atomv->atom->u.align;
  }
  
  static void if_then_else_handler(struct ref_formatting_stack **stack)
@@@ -574,16 -574,16 +574,16 @@@
  
  static void if_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
  {
 -      struct ref_formatting_stack *new;
 +      struct ref_formatting_stack *new_stack;
        struct if_then_else *if_then_else = xcalloc(sizeof(struct if_then_else), 1);
  
        if_then_else->str = atomv->atom->u.if_then_else.str;
        if_then_else->cmp_status = atomv->atom->u.if_then_else.cmp_status;
  
        push_stack_element(&state->stack);
 -      new = state->stack;
 -      new->at_end = if_then_else_handler;
 -      new->at_end_data = if_then_else;
 +      new_stack = state->stack;
 +      new_stack->at_end = if_then_else_handler;
 +      new_stack->at_end_data = if_then_else;
  }
  
  static int is_empty(const char *s)
@@@ -769,7 -769,7 +769,7 @@@ static void grab_common_values(struct a
                if (deref)
                        name++;
                if (!strcmp(name, "objecttype"))
 -                      v->s = typename(obj->type);
 +                      v->s = type_name(obj->type);
                else if (!strcmp(name, "objectsize")) {
                        v->value = sz;
                        v->s = xstrfmt("%lu", sz);
@@@ -795,7 -795,7 +795,7 @@@ static void grab_tag_values(struct atom
                if (!strcmp(name, "tag"))
                        v->s = tag->tag;
                else if (!strcmp(name, "type") && tag->tagged)
 -                      v->s = typename(tag->tagged->type);
 +                      v->s = type_name(tag->tagged->type);
                else if (!strcmp(name, "object") && tag->tagged)
                        v->s = xstrdup(oid_to_hex(&tag->tagged->oid));
        }
@@@ -2000,7 -2000,7 +2000,7 @@@ static void do_merge_filter(struct ref_
        free(to_clear);
  }
  
- int add_str_to_commit_list(struct string_list_item *item, void *commit_list)
+ static int add_str_to_commit_list(struct string_list_item *item, void *commit_list)
  {
        struct object_id oid;
        struct commit *commit;