diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 00:12:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 00:12:04 -0700 |
| commit | 4682693e9ccc04252d0fad6f5627fc056abcdbba (patch) | |
| tree | cfd7ed7e969a2f461d24a111187613cb9ba87f9a /tag.c | |
| parent | Merge branch 'jl/submodule-ignore-diff' (diff) | |
| parent | Merge branch 'xx/trivial' into maint (diff) | |
| download | git-1.7.3-rc0.tar.gz git-1.7.3-rc0.zip | |
Merge branch 'maint'v1.7.3-rc0
* maint:
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) |