diff options
| author | Ben Straub <bs@github.com> | 2013-09-25 14:40:19 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-09-25 14:40:19 -0700 |
| commit | 49781a03f0ea2d33b465010c5533b6026cbc1141 (patch) | |
| tree | 34243b7c517d241eb8ecb980c10800bea3928f3b /src | |
| parent | b6f60a4d964d66b562092fdeb8f76e902bf05fa4 (diff) | |
| download | libgit2-49781a03f0ea2d33b465010c5533b6026cbc1141.tar.gz | |
Blame: minor cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/blame_git.c | 7 | ||||
| -rw-r--r-- | src/blame_git.h | 1 |
2 files changed, 4 insertions, 4 deletions
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, |