Commit 49781a03 by Ben Straub

Blame: minor cleanup

parent b6f60a4d
...@@ -36,7 +36,7 @@ GIT_BEGIN_DECL ...@@ -36,7 +36,7 @@ GIT_BEGIN_DECL
* @param repo the repository to look up the object * @param repo the repository to look up the object
* @param id the unique identifier for the object * @param id the unique identifier for the object
* @param type the type of 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_EXTERN(int) git_object_lookup(
git_object **object, git_object **object,
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "blame_git.h" #include "blame_git.h"
#include "commit.h" #include "commit.h"
#include "blob.h" #include "blob.h"
#include "xdiff/xinclude.h"
/* /*
* Origin is refcounted and usually we keep the blob contents to be * 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) ...@@ -108,9 +109,9 @@ static int find_last_in_target(git_blame *blame, git_blame__origin *target)
* *
* <---- e -----> * <---- e ----->
* <------> (entirely within) * <------> (entirely within)
* <------------> (overlaps after) * <------------> (extends past)
* <------------> (overlaps before) * <------------> (starts before)
* <------------------> (overlaps both) * <------------------> (entirely encloses)
* *
* Split e into potentially three parts; before this chunk, the chunk * Split e into potentially three parts; before this chunk, the chunk
* to be blamed for the parent, and after that portion. * to be blamed for the parent, and after that portion.
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#define INCLUDE_blame_git__ #define INCLUDE_blame_git__
#include "blame.h" #include "blame.h"
#include "xdiff/xinclude.h"
int git_blame__get_origin( int git_blame__get_origin(
git_blame__origin **out, git_blame__origin **out,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment