From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Sep 2010 07:12:04 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc0^0
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4682693e9ccc04252d0fad6f5627fc056abcdbba?hp=-c

Merge branch 'maint'

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

4682693e9ccc04252d0fad6f5627fc056abcdbba
diff --combined object.c
index 7adfda75f2,2eda53cc61..7e1f2bbed2
--- a/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)