summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-23 22:27:03 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-23 22:27:03 -0800
commit816c02ce8ecddce065e83db9f4ecb78f6b0e23dc (patch)
treeb85fa8225e982f67dd4e9d516b92c3f03a1f99bc /commit.c
parent1d3d03bbeaaf55844868affc96231930aae792e6 (diff)
parent7bd1527d2d8c80a6e9a0f8583082a5aee5428c68 (diff)
downloadgit-816c02ce8ecddce065e83db9f4ecb78f6b0e23dc.tar.gz
Merge fixes early for next maint series.
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/commit.c b/commit.c
index c550a00d82..06d5439152 100644
--- a/commit.c
+++ b/commit.c
@@ -212,7 +212,8 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
if (memcmp(bufptr, "tree ", 5))
return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
if (get_sha1_hex(bufptr + 5, parent) < 0)
- return error("bad tree pointer in commit %s\n", sha1_to_hex(item->object.sha1));
+ return error("bad tree pointer in commit %s",
+ sha1_to_hex(item->object.sha1));
item->tree = lookup_tree(parent);
if (item->tree)
n_refs++;