Merge branch 'xx/trivial' into maint

gitster · gitster · commit af24059fa299 · 2010-09-06T00:11:59.000-07:00
* xx/trivial:
  tag.c: whitespace breakages fix
  Fix whitespace issue in object.c
  t5505: add missing &amp;&amp;
diff --git 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;
 }
 
 int object_list_contains(struct object_list *list, struct object *obj)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
@@ -435,7 +435,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)
 '
diff --git 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;
 }
 
 static unsigned long parse_tag_date(const char *buf, const char *tail)

Original file line number	Diff line number	Diff line change
`@@ -211,10 +211,10 @@ struct object_list object_list_insert(struct object item,`
`211`	`211`	`struct object_list **list_p)`
`212`	`212`	`{`
`213`	`213`	`struct object_list *new_list = xmalloc(sizeof(struct object_list));`
`214`		`- new_list->item = item;`
`215`		`- new_list->next = *list_p;`
`216`		`- *list_p = new_list;`
`217`		`- return new_list;`
	`214`	`+ new_list->item = item;`
	`215`	`+ new_list->next = *list_p;`
	`216`	`+ *list_p = new_list;`
	`217`	`+ return new_list;`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`int object_list_contains(struct object_list list, struct object obj)`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ test_expect_success 'update --prune' '`
`435`	`435`	`git branch -m side2 side3) &&`
`436`	`436`	`(cd test &&`
`437`	`437`	`git remote update --prune &&`
`438`		`- (cd ../one && git branch -m side3 side2)`
	`438`	`+ (cd ../one && git branch -m side3 side2) &&`
`439`	`439`	`git rev-parse refs/remotes/origin/side3 &&`
`440`	`440`	`test_must_fail git rev-parse refs/remotes/origin/side2)`
`441`	`441`	`'`