diff options
| author | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
| commit | 64c5112188647fcbfbe2bbfb897abfbc21912ba8 (patch) | |
| tree | 5113408a049178d14664f72cc1666655783d95d5 /examples/diff.c | |
| parent | 469827812f95e979e3c6468567b2c9ed138a9849 (diff) | |
| parent | ca94e031fa21787ae6336f0aada1b01b2dd22077 (diff) | |
| download | libgit2-64c5112188647fcbfbe2bbfb897abfbc21912ba8.tar.gz | |
Merge pull request #1087 from libgit2/great-renaming
The Great Renaming of 2012
Diffstat (limited to 'examples/diff.c')
| -rw-r--r-- | examples/diff.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/diff.c b/examples/diff.c index 38231d219..a465182ba 100644 --- a/examples/diff.c +++ b/examples/diff.c @@ -30,7 +30,7 @@ static int resolve_to_tree( git_reference_resolve(&resolved, ref); git_reference_free(ref); if (resolved) { - git_object_lookup(&obj, repo, git_reference_oid(resolved), GIT_OBJ_ANY); + git_object_lookup(&obj, repo, git_reference_target(resolved), GIT_OBJ_ANY); git_reference_free(resolved); } } @@ -63,12 +63,12 @@ char *colors[] = { }; static int printer( - void *data, const git_diff_delta *delta, const git_diff_range *range, char usage, const char *line, - size_t line_len) + size_t line_len, + void *data) { int *last_color = data, color = 0; @@ -225,9 +225,9 @@ int main(int argc, char *argv[]) fputs(colors[0], stdout); if (compact) - check(git_diff_print_compact(diff, &color, printer), "Displaying diff"); + check(git_diff_print_compact(diff, printer, &color), "Displaying diff"); else - check(git_diff_print_patch(diff, &color, printer), "Displaying diff"); + check(git_diff_print_patch(diff, printer, &color), "Displaying diff"); if (color >= 0) fputs(colors[0], stdout); |