Commit 49781a03f0ea2d33b465010c5533b6026cbc1141
2013-09-25T14:40:19
Blame: minor cleanup
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/include/git2/object.h b/include/git2/object.h
index 7ec17cd..c40631f 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 94e13f8..4df6513 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 2b78011..3ec2710 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,