diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:53:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:53:35 -0700 |
| commit | 2fa4fff4b9ba9998685c0b38cbadb49ac38734ce (patch) | |
| tree | e82c022130c637a6892b11843e5a89178c032908 /object.c | |
| parent | Merge branch 'zj/diff-stat-smaller-num-columns' (diff) | |
| parent | remove blank filename in error message (diff) | |
| download | tgif-2fa4fff4b9ba9998685c0b38cbadb49ac38734ce.tar.xz | |
Merge branch 'pw/message-cleanup'
Many error/warning messages had extra trailing newlines that are
unnecessary.
By Pete Wyckoff
* pw/message-cleanup:
remove blank filename in error message
remove superfluous newlines in error messages
Diffstat (limited to 'object.c')
| -rw-r--r-- | object.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -176,7 +176,7 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t obj = &tag->object; } } else { - warning("object %s has unknown type id %d\n", sha1_to_hex(sha1), type); + warning("object %s has unknown type id %d", sha1_to_hex(sha1), type); obj = NULL; } if (obj && obj->type == OBJ_NONE) @@ -202,7 +202,7 @@ struct object *parse_object(const unsigned char *sha1) (!obj && has_sha1_file(sha1) && sha1_object_info(sha1, NULL) == OBJ_BLOB)) { if (check_sha1_signature(repl, NULL, 0, NULL) < 0) { - error("sha1 mismatch %s\n", sha1_to_hex(repl)); + error("sha1 mismatch %s", sha1_to_hex(repl)); return NULL; } parse_blob_buffer(lookup_blob(sha1), NULL, 0); @@ -213,7 +213,7 @@ struct object *parse_object(const unsigned char *sha1) if (buffer) { if (check_sha1_signature(repl, buffer, size, typename(type)) < 0) { free(buffer); - error("sha1 mismatch %s\n", sha1_to_hex(repl)); + error("sha1 mismatch %s", sha1_to_hex(repl)); return NULL; } |