tree-diff: convert diff_root_tree_sha1 to struct object_id

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 24e29ad7eab5edc0964a51f32602b062daabb907..e242726f08e2397c8875e0d1794d58561ac4ecd9 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -566,8 +566,8 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
                               commit->tree->object.oid.hash, "", &rev->diffopt);
        }
        else
                               commit->tree->object.oid.hash, "", &rev->diffopt);
        }
        else

-               diff_root_tree_sha1(commit->tree->object.oid.hash,
-                                   "", &rev->diffopt);
+               diff_root_tree_oid(&commit->tree->object.oid,
+                                  "", &rev->diffopt);

 
        /* Export the referenced blobs, and remember the marks. */
        for (i = 0; i < diff_queued_diff.nr; i++)
 
        /* Export the referenced blobs, and remember the marks. */
        for (i = 0; i < diff_queued_diff.nr; i++)

diff --git a/diff.h b/diff.h
index 6aeeda035e7e8e1a739e34f0533867b94c60040d..8d46a670990856af2653d5f158cb34ca4e2fc91b 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -215,8 +215,8 @@ extern struct combine_diff_path *diff_tree_paths(
        struct strbuf *base, struct diff_options *opt);
 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
                          const char *base, struct diff_options *opt);
        struct strbuf *base, struct diff_options *opt);
 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
                          const char *base, struct diff_options *opt);

-extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
-                               struct diff_options *opt);
+extern int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
+                             struct diff_options *opt);

 
 struct combine_diff_path {
        struct combine_diff_path *next;
 
 struct combine_diff_path {
        struct combine_diff_path *next;

diff --git a/log-tree.c b/log-tree.c
index 9c0c64a2d857a07f9fb5abfc5d9833d48b6d7d43..b40242534b0829f7352ba45112512f0d7042f7ac 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -803,7 +803,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
        parents = get_saved_parents(opt, commit);
        if (!parents) {
                if (opt->show_root_diff) {
        parents = get_saved_parents(opt, commit);
        if (!parents) {
                if (opt->show_root_diff) {

-                       diff_root_tree_sha1(oid->hash, "", &opt->diffopt);
+                       diff_root_tree_oid(oid, "", &opt->diffopt);

                        log_tree_diff_flush(opt);
                }
                return !opt->loginfo;
                        log_tree_diff_flush(opt);
                }
                return !opt->loginfo;

diff --git a/patch-ids.c b/patch-ids.c
index a70a291d829ee23dde67f2df142f184b0983a70e..aaf462c03085e164f6b93a686fb8d2575b5bb7ba 100644 (file)
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -20,7 +20,7 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
                diff_tree_sha1(commit->parents->item->object.oid.hash,
                               commit->object.oid.hash, "", options);
        else
                diff_tree_sha1(commit->parents->item->object.oid.hash,
                               commit->object.oid.hash, "", options);
        else

-               diff_root_tree_sha1(commit->object.oid.hash, "", options);
+               diff_root_tree_oid(&commit->object.oid, "", options);

        diffcore_std(options);
        return diff_flush_patch_id(options, oid, diff_header_only);
 }
        diffcore_std(options);
        return diff_flush_patch_id(options, oid, diff_header_only);
 }

diff --git a/tree-diff.c b/tree-diff.c
index 7ae1f10b2ee43f82988eef6dbededaad276bfb94..f9bbaf3c472bc45289a2b2050e132a22f43b4d5e 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -711,7 +711,7 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha
        return retval;
 }
 
        return retval;
 }
 

-int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_options *opt)
+int diff_root_tree_oid(const struct object_id *new_oid, const char *base, struct diff_options *opt)

 {
 {

-       return diff_tree_sha1(NULL, new, base, opt);
+       return diff_tree_sha1(NULL, new_oid->hash, base, opt);

 }
 }