object-name.h: move declarations for object-name.c functions from cache.h

[thirdparty/git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 91051dc3258925a10d6de5d67101720376b8d630..cd5f39f22f40a5278ca4558ebd056b88fc0ea93b 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1,10 +1,13 @@
 #include "cache.h"
 #include "object-store.h"
 #include "commit.h"
+#include "convert.h"
 #include "blob.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "environment.h"
 #include "hex.h"
+#include "object-name.h"
 #include "quote.h"
 #include "xdiff-interface.h"
 #include "xdiff/xmacros.h"
@@ -333,7 +336,7 @@ static char *grab_blob(struct repository *r,
                *size = fill_textconv(r, textconv, df, &blob);
                free_filespec(df);
        } else {
-               blob = read_object_file(oid, &type, size);
+               blob = repo_read_object_file(r, oid, &type, size);
                if (type != OBJ_BLOB)
                        die("object '%s' is not a blob!", oid_to_hex(oid));
        }
@@ -949,11 +952,11 @@ static void show_combined_header(struct combine_diff_path *elem,
                         "", elem->path, line_prefix, c_meta, c_reset);
        printf("%s%sindex ", line_prefix, c_meta);
        for (i = 0; i < num_parent; i++) {
-               abb = find_unique_abbrev(&elem->parent[i].oid,
-                                        abbrev);
+               abb = repo_find_unique_abbrev(the_repository,
+                                             &elem->parent[i].oid, abbrev);
                printf("%s%s", i ? "," : "", abb);
        }
-       abb = find_unique_abbrev(&elem->oid, abbrev);
+       abb = repo_find_unique_abbrev(the_repository, &elem->oid, abbrev);
        printf("..%s%s\n", abb, c_reset);
 
        if (mode_differs) {