diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 11:11:59 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 11:11:59 +0400 |
commit | af24059fa299f1656692f5807eddd3b30b5f3cfb (patch) | |
tree | c5e12eb4c91edd04e9c8fea6408678c5660946e4 | |
parent | dd34b6be8a3e869f3e0d62a13115f02d90cf4f80 (diff) | |
parent | d2c030d4773f1f00165bffc34e2487043df326e7 (diff) |
Merge branch 'xx/trivial' into maint
* xx/trivial:
tag.c: whitespace breakages fix
Fix whitespace issue in object.c
t5505: add missing &&
-rw-r--r-- | object.c | 8 | ||||
-rwxr-xr-x | t/t5505-remote.sh | 2 | ||||
-rw-r--r-- | tag.c | 12 |
3 files changed, 11 insertions, 11 deletions
@@ -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 index 4c498b1902..5d1c66ea71 100755 --- 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) ' @@ -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) |