diff options
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index 2edea41a23..60e979dc1b 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -6,11 +6,16 @@ #include "commit.h" #include "diff.h" #include "diffcore.h" +#include "gettext.h" +#include "hex.h" +#include "object-name.h" #include "revision.h" #include "cache-tree.h" #include "unpack-trees.h" #include "refs.h" #include "submodule.h" +#include "symlinks.h" +#include "trace.h" #include "dir.h" #include "fsmonitor.h" #include "commit-reach.h" @@ -581,7 +586,7 @@ void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb) if (revs->pending.nr == 1) { struct object_id oid; - if (get_oid("HEAD", &oid)) + if (repo_get_oid(the_repository, "HEAD", &oid)) die(_("unable to get HEAD")); mb_child[1] = lookup_commit_reference(the_repository, &oid); @@ -673,7 +678,7 @@ int index_differs_from(struct repository *r, return (has_changes != 0); } -static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data) +static struct strbuf *idiff_prefix_cb(struct diff_options *opt UNUSED, void *data) { return data; } |