summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-02 15:10:05 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-02 15:10:05 -0800
commitc40610422e1157e71dbc3c1a2f9e19bbe117962f (patch)
tree251299eef1d983dfdcff8c6455e968234c6d0a56 /commit.c
parentcbfb73d73f272f194bafa70d5be1f35abc265c79 (diff)
parent765ac8ec469f110e88376e4fac05d0ed475bcb28 (diff)
downloadgit-c40610422e1157e71dbc3c1a2f9e19bbe117962f.tar.gz
Merge part of 'lt/rev-list' into 'fk/blame'
Now blame will depend on the new revision walker infrastructure, we need to make it depend on earlier parts of Linus' rev-list topic branch, hence this merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
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++;