From 49781a03f0ea2d33b465010c5533b6026cbc1141 Mon Sep 17 00:00:00 2001
From: Ben Straub <bs@github.com>
Date: Wed, 25 Sep 2013 14:40:19 -0700
Subject: [PATCH] Blame: minor cleanup

---
 include/git2/object.h | 2 +-
 src/blame_git.c       | 7 ++++---
 src/blame_git.h       | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/git2/object.h b/include/git2/object.h
index 7ec17cd8e..c40631fa6 100644
--- a/include/git2/object.h
+++ b/include/git2/object.h
@@ -36,7 +36,7 @@ GIT_BEGIN_DECL
  * @param repo the repository to look up the object
  * @param id the unique identifier for the object
  * @param type the type of the object
- * @return a reference to the object
+ * @return 0 or an error code
  */
 GIT_EXTERN(int) git_object_lookup(
 		git_object **object,
diff --git a/src/blame_git.c b/src/blame_git.c
index 94e13f8ef..4df65139a 100644
--- a/src/blame_git.c
+++ b/src/blame_git.c
@@ -8,6 +8,7 @@
 #include "blame_git.h"
 #include "commit.h"
 #include "blob.h"
+#include "xdiff/xinclude.h"
 
 /*
  * Origin is refcounted and usually we keep the blob contents to be
@@ -108,9 +109,9 @@ static int find_last_in_target(git_blame *blame, git_blame__origin *target)
  *
  *                <---- e ----->
  *                   <------>         (entirely within)
- *                   <------------>   (overlaps after)
- *             <------------>         (overlaps before)
- *             <------------------>   (overlaps both)
+ *                   <------------>   (extends past)
+ *             <------------>         (starts before)
+ *             <------------------>   (entirely encloses)
  *
  * Split e into potentially three parts; before this chunk, the chunk
  * to be blamed for the parent, and after that portion.
diff --git a/src/blame_git.h b/src/blame_git.h
index 2b780116b..3ec2710b8 100644
--- a/src/blame_git.h
+++ b/src/blame_git.h
@@ -8,7 +8,6 @@
 #define INCLUDE_blame_git__
 
 #include "blame.h"
-#include "xdiff/xinclude.h"
 
 int git_blame__get_origin(
 		git_blame__origin **out,