diff-lib: convert do_diff_cache to struct object_id

This is needed to convert parse_tree_indirect.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/am.c b/builtin/am.c
index 642d7047d9a02150992a3eb5d551543ddca2a77b..200d9dbed4644a87b2ba5ffc1d77585a4f0cd157 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1145,7 +1145,7 @@ static int index_has_changes(struct strbuf *sb)
                DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);
                if (!sb)
                        DIFF_OPT_SET(&opt, QUICK);
                DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);
                if (!sb)
                        DIFF_OPT_SET(&opt, QUICK);

-               do_diff_cache(head.hash, &opt);
+               do_diff_cache(&head, &opt);

                diffcore_std(&opt);
                for (i = 0; sb && i < diff_queued_diff.nr; i++) {
                        if (i)
                diffcore_std(&opt);
                for (i = 0; sb && i < diff_queued_diff.nr; i++) {
                        if (i)

diff --git a/builtin/blame.c b/builtin/blame.c
index 58bb274d0234607400d23fdb02488b8f8c99bfce..e920314a74de5c6c02de8331b37a991798e6ef8b 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -563,7 +563,7 @@ static struct origin *find_origin(struct scoreboard *sb,
        diff_setup_done(&diff_opts);
 
        if (is_null_oid(&origin->commit->object.oid))
        diff_setup_done(&diff_opts);
 
        if (is_null_oid(&origin->commit->object.oid))

-               do_diff_cache(parent->tree->object.oid.hash, &diff_opts);
+               do_diff_cache(&parent->tree->object.oid, &diff_opts);

        else
                diff_tree_sha1(parent->tree->object.oid.hash,
                               origin->commit->tree->object.oid.hash,
        else
                diff_tree_sha1(parent->tree->object.oid.hash,
                               origin->commit->tree->object.oid.hash,


@@ -633,7 +633,7 @@ static struct origin *find_rename(struct scoreboard *sb,
        diff_setup_done(&diff_opts);
 
        if (is_null_oid(&origin->commit->object.oid))
        diff_setup_done(&diff_opts);
 
        if (is_null_oid(&origin->commit->object.oid))

-               do_diff_cache(parent->tree->object.oid.hash, &diff_opts);
+               do_diff_cache(&parent->tree->object.oid, &diff_opts);

        else
                diff_tree_sha1(parent->tree->object.oid.hash,
                               origin->commit->tree->object.oid.hash,
        else
                diff_tree_sha1(parent->tree->object.oid.hash,
                               origin->commit->tree->object.oid.hash,


@@ -1272,7 +1272,7 @@ static void find_copy_in_parent(struct scoreboard *sb,
                DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
 
        if (is_null_oid(&target->commit->object.oid))
                DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
 
        if (is_null_oid(&target->commit->object.oid))

-               do_diff_cache(parent->tree->object.oid.hash, &diff_opts);
+               do_diff_cache(&parent->tree->object.oid, &diff_opts);

        else
                diff_tree_sha1(parent->tree->object.oid.hash,
                               target->commit->tree->object.oid.hash,
        else
                diff_tree_sha1(parent->tree->object.oid.hash,
                               target->commit->tree->object.oid.hash,

diff --git a/builtin/reset.c b/builtin/reset.c
index 0be52fa36af414227a0069e50f7901640ade94d0..3415dac5d59815c7846c6631ecfe2e74e09a05a7 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -154,7 +154,7 @@ static int read_from_tree(const struct pathspec *pathspec,
        opt.format_callback = update_index_from_diff;
        opt.format_callback_data = &intent_to_add;
 
        opt.format_callback = update_index_from_diff;
        opt.format_callback_data = &intent_to_add;
 

-       if (do_diff_cache(tree_oid->hash, &opt))
+       if (do_diff_cache(tree_oid, &opt))

                return 1;
        diffcore_std(&opt);
        diff_flush(&opt);
                return 1;
        diffcore_std(&opt);
        diff_flush(&opt);

diff --git a/diff-lib.c b/diff-lib.c
index 52447466b5d16c4e8978795b0122e2182e83c5cb..ee9df0f84721914506c6482f7d654c1ee01937ba 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -478,7 +478,7 @@ static int oneway_diff(const struct cache_entry * const *src,
 }
 
 static int diff_cache(struct rev_info *revs,
 }
 
 static int diff_cache(struct rev_info *revs,

-                     const unsigned char *tree_sha1,
+                     const struct object_id *tree_oid,

                      const char *tree_name,
                      int cached)
 {
                      const char *tree_name,
                      int cached)
 {


@@ -486,10 +486,10 @@ static int diff_cache(struct rev_info *revs,
        struct tree_desc t;
        struct unpack_trees_options opts;
 
        struct tree_desc t;
        struct unpack_trees_options opts;
 

-       tree = parse_tree_indirect(tree_sha1);
+       tree = parse_tree_indirect(tree_oid->hash);

        if (!tree)
                return error("bad tree object %s",
        if (!tree)
                return error("bad tree object %s",

-                            tree_name ? tree_name : sha1_to_hex(tree_sha1));
+                            tree_name ? tree_name : oid_to_hex(tree_oid));

        memset(&opts, 0, sizeof(opts));
        opts.head_idx = 1;
        opts.index_only = cached;
        memset(&opts, 0, sizeof(opts));
        opts.head_idx = 1;
        opts.index_only = cached;


@@ -512,7 +512,7 @@ int run_diff_index(struct rev_info *revs, int cached)
        struct object_array_entry *ent;
 
        ent = revs->pending.objects;
        struct object_array_entry *ent;
 
        ent = revs->pending.objects;

-       if (diff_cache(revs, ent->item->oid.hash, ent->name, cached))
+       if (diff_cache(revs, &ent->item->oid, ent->name, cached))

                exit(128);
 
        diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
                exit(128);
 
        diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");


@@ -522,7 +522,7 @@ int run_diff_index(struct rev_info *revs, int cached)
        return 0;
 }
 
        return 0;
 }
 

-int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
+int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)

 {
        struct rev_info revs;
 
 {
        struct rev_info revs;
 


@@ -530,7 +530,7 @@ int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
        copy_pathspec(&revs.prune_data, &opt->pathspec);
        revs.diffopt = *opt;
 
        copy_pathspec(&revs.prune_data, &opt->pathspec);
        revs.diffopt = *opt;
 

-       if (diff_cache(&revs, tree_sha1, NULL, 1))
+       if (diff_cache(&revs, tree_oid, NULL, 1))

                exit(128);
        return 0;
 }
                exit(128);
        return 0;
 }

diff --git a/diff.h b/diff.h
index 5be1ee77a759f330db4ace64a5772f23e3d19d50..d75e6d15e28dea0318cbec174694d68ac695bb5d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -354,7 +354,7 @@ extern const char *diff_aligned_abbrev(const struct object_id *sha1, int);
 extern int run_diff_files(struct rev_info *revs, unsigned int option);
 extern int run_diff_index(struct rev_info *revs, int cached);
 
 extern int run_diff_files(struct rev_info *revs, unsigned int option);
 extern int run_diff_index(struct rev_info *revs, int cached);
 

-extern int do_diff_cache(const unsigned char *, struct diff_options *);
+extern int do_diff_cache(const struct object_id *, struct diff_options *);

 extern int diff_flush_patch_id(struct diff_options *, unsigned char *, int);
 
 extern int diff_result_code(struct diff_options *, int);
 extern int diff_flush_patch_id(struct diff_options *, unsigned char *, int);
 
 extern int diff_result_code(struct diff_options *, int);