diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 00:11:59 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 00:11:59 -0700 |
commit | af24059fa299f1656692f5807eddd3b30b5f3cfb (patch) | |
tree | c5e12eb4c91edd04e9c8fea6408678c5660946e4 /tag.c | |
parent | dd34b6be8a3e869f3e0d62a13115f02d90cf4f80 (diff) | |
parent | d2c030d4773f1f00165bffc34e2487043df326e7 (diff) | |
download | git-af24059fa299f1656692f5807eddd3b30b5f3cfb.tar.gz git-af24059fa299f1656692f5807eddd3b30b5f3cfb.tar.xz |
Merge branch 'xx/trivial' into maint
* xx/trivial:
tag.c: whitespace breakages fix
Fix whitespace issue in object.c
t5505: add missing &&
Diffstat (limited to 'tag.c')
-rw-r--r-- | tag.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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) |