Merge branch 'maint'

* maint:
tag.c: whitespace breakages fix
Fix whitespace issue in object.c
t5505: add missing &&

diff --combined object.c
index 7adfda75f2914863c3c8eec86abffe581be4d480,2eda53cc6144430f5fcf4b93e80fac9b9e147bfd..7e1f2bbed2ad7f331fefc78d759acb14050bea48
--- 1/object.c
--- 2/object.c
+++ b/object.c
@@@ -199,7 -199,7 +199,7 @@@ struct object *parse_object(const unsig
                        return NULL;
                }
  
 -              obj = parse_object_buffer(repl, type, size, buffer, &eaten);
 +              obj = parse_object_buffer(sha1, type, size, buffer, &eaten);
                if (!eaten)
                        free(buffer);
                return obj;
@@@ -211,10 -211,10 +211,10 @@@ struct object_list *object_list_insert(
                                       struct object_list **list_p)
  {
        struct object_list *new_list = xmalloc(sizeof(struct object_list));
-         new_list->item = item;
-         new_list->next = *list_p;
-         *list_p = new_list;
-         return new_list;
+       new_list->item = item;
+       new_list->next = *list_p;
+       *list_p = new_list;
+       return new_list;
  }
  
  int object_list_contains(struct object_list *list, struct object *obj)