From 65b26eb4668f0499bc1e671edb59842529cb286d Mon Sep 17 00:00:00 2001
From: Jens Lehmann <Jens.Lehmann@web.de>
Date: Sun, 5 Sep 2010 14:56:11 +0200
Subject: t5505: add missing &&

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 936fe0a..4b6befe 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -371,7 +371,7 @@ test_expect_success 'update --prune' '
 	 git branch -m side2 side3) &&
 	(cd test &&
 	 git remote update --prune &&
-	 (cd ../one && git branch -m side3 side2)
+	 (cd ../one && git branch -m side3 side2) &&
 	 git rev-parse refs/remotes/origin/side3 &&
 	 test_must_fail git rev-parse refs/remotes/origin/side2)
 '
-- 
cgit v0.10.2-6-g49f6


From 55b4e9e43227632dd372f916c08dca6e26118af5 Mon Sep 17 00:00:00 2001
From: Jared Hance <jaredhance@gmail.com>
Date: Sun, 5 Sep 2010 15:36:33 -0400
Subject: Fix whitespace issue in object.c

Change some expanded tabs (spaces) to tabs in object.c.

Signed-off-by: Jared Hance <jaredhance@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object.c b/object.c
index fe8eaaf..a23fbea 100644
--- a/object.c
+++ b/object.c
@@ -211,10 +211,10 @@ struct object_list *object_list_insert(struct object *item,
 				       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;
 }
 
 void object_list_append(struct object *item,
-- 
cgit v0.10.2-6-g49f6


From d2c030d4773f1f00165bffc34e2487043df326e7 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 5 Sep 2010 22:32:05 -0700
Subject: tag.c: whitespace breakages fix

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/tag.c b/tag.c
index 4470d2b..f2dd1d0 100644
--- a/tag.c
+++ b/tag.c
@@ -28,12 +28,12 @@ struct tag *lookup_tag(const unsigned char *sha1)
 		return create_object(sha1, OBJ_TAG, alloc_tag_node());
 	if (!obj->type)
 		obj->type = OBJ_TAG;
-        if (obj->type != OBJ_TAG) {
-                error("Object %s is a %s, not a tag",
-                      sha1_to_hex(sha1), typename(obj->type));
-                return NULL;
-        }
-        return (struct tag *) obj;
+	if (obj->type != OBJ_TAG) {
+		error("Object %s is a %s, not a tag",
+		      sha1_to_hex(sha1), typename(obj->type));
+		return NULL;
+	}
+	return (struct tag *) obj;
 }
 
 int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
@@ -44,9 +44,9 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
 	char type[20];
 	const char *start = data;
 
-        if (item->object.parsed)
-                return 0;
-        item->object.parsed = 1;
+	if (item->object.parsed)
+		return 0;
+	item->object.parsed = 1;
 
 	if (size < 64)
 		return -1;
-- 
cgit v0.10.2-6-g49f6