diff: convert fill_filespec 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/blame.c b/builtin/blame.c
index 1043e5376f35bd56f498f9078676c08ffcff687d..5ad435380f2055055744881465874001e7d037c9 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -163,7 +163,7 @@ int textconv_object(const char *path,
        struct userdiff_driver *textconv;
 
        df = alloc_filespec(path);
        struct userdiff_driver *textconv;
 
        df = alloc_filespec(path);

-       fill_filespec(df, oid->hash, oid_valid, mode);
+       fill_filespec(df, oid, oid_valid, mode);

        textconv = get_textconv(df);
        if (!textconv) {
                free_filespec(df);
        textconv = get_textconv(df);
        if (!textconv) {
                free_filespec(df);

diff --git a/builtin/diff.c b/builtin/diff.c
index 8c03ddaf589bbdce723b00a9d911673b064bd13e..b2d7c32cdb401ae9097c0b2af14bf5f99b0999a0 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -57,8 +57,8 @@ static void stuff_change(struct diff_options *opt,
 
        one = alloc_filespec(old_name);
        two = alloc_filespec(new_name);
 
        one = alloc_filespec(old_name);
        two = alloc_filespec(new_name);

-       fill_filespec(one, old_oid->hash, old_oid_valid, old_mode);
-       fill_filespec(two, new_oid->hash, new_oid_valid, new_mode);
+       fill_filespec(one, old_oid, old_oid_valid, old_mode);
+       fill_filespec(two, new_oid, new_oid_valid, new_mode);

 
        diff_queue(&diff_queued_diff, one, two);
 }
 
        diff_queue(&diff_queued_diff, one, two);
 }

diff --git a/combine-diff.c b/combine-diff.c
index 2848034fe9c3f3cc1d930347e892cee1cbed4f52..ad063ecb137849ab0823593a24810976d4c98aee 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -302,7 +302,7 @@ static char *grab_blob(const struct object_id *oid, unsigned int mode,
                return xcalloc(1, 1);
        } else if (textconv) {
                struct diff_filespec *df = alloc_filespec(path);
                return xcalloc(1, 1);
        } else if (textconv) {
                struct diff_filespec *df = alloc_filespec(path);

-               fill_filespec(df, oid->hash, 1, mode);
+               fill_filespec(df, oid, 1, mode);

                *size = fill_textconv(textconv, df, &blob);
                free_filespec(df);
        } else {
                *size = fill_textconv(textconv, df, &blob);
                free_filespec(df);
        } else {


@@ -1022,7 +1022,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
                                                   &result_size, NULL, NULL);
                } else if (textconv) {
                        struct diff_filespec *df = alloc_filespec(elem->path);
                                                   &result_size, NULL, NULL);
                } else if (textconv) {
                        struct diff_filespec *df = alloc_filespec(elem->path);

-                       fill_filespec(df, null_sha1, 0, st.st_mode);
+                       fill_filespec(df, &null_oid, 0, st.st_mode);

                        result_size = fill_textconv(textconv, df, &result);
                        free_filespec(df);
                } else if (0 <= (fd = open(elem->path, O_RDONLY))) {
                        result_size = fill_textconv(textconv, df, &result);
                        free_filespec(df);
                } else if (0 <= (fd = open(elem->path, O_RDONLY))) {

diff --git a/diff-lib.c b/diff-lib.c
index 1e8215df50e84f6ce191d94ee1c94b336acc7761..9e076a48861a9be8f8fe9d17e6fa18197fc49fe1 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -409,7 +409,7 @@ static void do_oneway_diff(struct unpack_trees_options *o,
                struct diff_filepair *pair;
                pair = diff_unmerge(&revs->diffopt, idx->name);
                if (tree)
                struct diff_filepair *pair;
                pair = diff_unmerge(&revs->diffopt, idx->name);
                if (tree)

-                       fill_filespec(pair->one, tree->oid.hash, 1,
+                       fill_filespec(pair->one, &tree->oid, 1,

                                      tree->ce_mode);
                return;
        }
                                      tree->ce_mode);
                return;
        }

diff --git a/diff-no-index.c b/diff-no-index.c
index 79229382b06cefc98aa8926065f0fb999ad1da2e..80ff17d460ed67fa4b38f8a8dfce7504b27bbb64 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -82,7 +82,7 @@ static struct diff_filespec *noindex_filespec(const char *name, int mode)
        if (!name)
                name = "/dev/null";
        s = alloc_filespec(name);
        if (!name)
                name = "/dev/null";
        s = alloc_filespec(name);

-       fill_filespec(s, null_sha1, 0, mode);
+       fill_filespec(s, &null_oid, 0, mode);

        if (name == file_from_standard_input)
                populate_from_stdin(s);
        return s;
        if (name == file_from_standard_input)
                populate_from_stdin(s);
        return s;

diff --git a/diff.c b/diff.c
index b9bb3f6ca472a7f21e443165651909c7a4606f4a..e0c179f5f2f474eeed1f5647ae6788c1919e2e8c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2702,13 +2702,13 @@ void free_filespec(struct diff_filespec *spec)
        }
 }
 
        }
 }
 

-void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
-                  int sha1_valid, unsigned short mode)
+void fill_filespec(struct diff_filespec *spec, const struct object_id *oid,
+                  int oid_valid, unsigned short mode)

 {
        if (mode) {
                spec->mode = canon_mode(mode);
 {
        if (mode) {
                spec->mode = canon_mode(mode);

-               hashcpy(spec->oid.hash, sha1);
-               spec->oid_valid = sha1_valid;
+               oidcpy(&spec->oid, oid);
+               spec->oid_valid = oid_valid;

        }
 }
 
        }
 }
 


@@ -5114,9 +5114,9 @@ void diff_addremove(struct diff_options *options,
        two = alloc_filespec(concatpath);
 
        if (addremove != '+')
        two = alloc_filespec(concatpath);
 
        if (addremove != '+')

-               fill_filespec(one, oid->hash, oid_valid, mode);
+               fill_filespec(one, oid, oid_valid, mode);

        if (addremove != '-') {
        if (addremove != '-') {

-               fill_filespec(two, oid->hash, oid_valid, mode);
+               fill_filespec(two, oid, oid_valid, mode);

                two->dirty_submodule = dirty_submodule;
        }
 
                two->dirty_submodule = dirty_submodule;
        }
 


@@ -5153,8 +5153,8 @@ void diff_change(struct diff_options *options,
 
        one = alloc_filespec(concatpath);
        two = alloc_filespec(concatpath);
 
        one = alloc_filespec(concatpath);
        two = alloc_filespec(concatpath);

-       fill_filespec(one, old_oid->hash, old_oid_valid, old_mode);
-       fill_filespec(two, new_oid->hash, new_oid_valid, new_mode);
+       fill_filespec(one, old_oid, old_oid_valid, old_mode);
+       fill_filespec(two, new_oid, new_oid_valid, new_mode);

        one->dirty_submodule = old_dirty_submodule;
        two->dirty_submodule = new_dirty_submodule;
        p = diff_queue(&diff_queued_diff, one, two);
        one->dirty_submodule = old_dirty_submodule;
        two->dirty_submodule = new_dirty_submodule;
        p = diff_queue(&diff_queued_diff, one, two);

diff --git a/diffcore-rename.c b/diffcore-rename.c
index f7444c86bde3909c8fca23f71c4852514eb26b88..3d9719dadcb4c3ce78e3151680692d4bee25200d 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -60,7 +60,7 @@ static int add_rename_dst(struct diff_filespec *two)
                memmove(rename_dst + first + 1, rename_dst + first,
                        (rename_dst_nr - first - 1) * sizeof(*rename_dst));
        rename_dst[first].two = alloc_filespec(two->path);
                memmove(rename_dst + first + 1, rename_dst + first,
                        (rename_dst_nr - first - 1) * sizeof(*rename_dst));
        rename_dst[first].two = alloc_filespec(two->path);

-       fill_filespec(rename_dst[first].two, two->oid.hash, two->oid_valid,
+       fill_filespec(rename_dst[first].two, &two->oid, two->oid_valid,

                      two->mode);
        rename_dst[first].pair = NULL;
        return 0;
                      two->mode);
        rename_dst[first].pair = NULL;
        return 0;

diff --git a/diffcore.h b/diffcore.h
index 623024135478088028cd42b8c6a744ebb04bf0a7..a30da161dafcf0d3951e3208000c54388803c8f0 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -52,7 +52,7 @@ struct diff_filespec {
 
 extern struct diff_filespec *alloc_filespec(const char *);
 extern void free_filespec(struct diff_filespec *);
 
 extern struct diff_filespec *alloc_filespec(const char *);
 extern void free_filespec(struct diff_filespec *);

-extern void fill_filespec(struct diff_filespec *, const unsigned char *,
+extern void fill_filespec(struct diff_filespec *, const struct object_id *,

                          int, unsigned short);
 
 #define CHECK_SIZE_ONLY 1
                          int, unsigned short);
 
 #define CHECK_SIZE_ONLY 1

diff --git a/grep.c b/grep.c
index a240b4cdb238bd6f412e8d8c36c5b44a4e76f290..3e21c92b9d49a2b68062158c47204f6dfdaa1c64 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1407,7 +1407,7 @@ static int fill_textconv_grep(struct userdiff_driver *driver,
                fill_filespec(df, gs->identifier, 1, 0100644);
                break;
        case GREP_SOURCE_FILE:
                fill_filespec(df, gs->identifier, 1, 0100644);
                break;
        case GREP_SOURCE_FILE:

-               fill_filespec(df, null_sha1, 0, 0100644);
+               fill_filespec(df, &null_oid, 0, 0100644);

                break;
        default:
                die("BUG: attempt to textconv something without a path?");
                break;
        default:
                die("BUG: attempt to textconv something without a path?");

diff --git a/line-log.c b/line-log.c
index b9087814b8ccd0082efc41c617e33e8046ea17d5..a3bd2f2d5f6fc25fbe5a77a9233eebe6c76d3f80 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -500,12 +500,12 @@ static struct commit *check_single_commit(struct rev_info *revs)
 static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
 {
        unsigned mode;
 static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
 {
        unsigned mode;

-       unsigned char sha1[20];
+       struct object_id oid;

 
        if (get_tree_entry(commit->object.oid.hash, spec->path,
 
        if (get_tree_entry(commit->object.oid.hash, spec->path,

-                          sha1, &mode))
+                          oid.hash, &mode))

                die("There is no path %s in the commit", spec->path);
                die("There is no path %s in the commit", spec->path);

-       fill_filespec(spec, sha1, 1, mode);
+       fill_filespec(spec, &oid, 1, mode);

 
        return;
 }
 
        return;
 }