Convert find_unique_abbrev* to struct object_id

Convert find_unique_abbrev and find_unique_abbrev_r to each take a
pointer to struct object_id.

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

diff --git a/builtin/blame.c b/builtin/blame.c
index 9dcb367b90d99fc9ebbbf878f53cd5b4651d7864..b980e8a1ddb5056dccf6d51cc33fc42026e3a517 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -499,7 +499,7 @@ static int read_ancestry(const char *graft_file)
 
 static int update_auto_abbrev(int auto_abbrev, struct blame_origin *suspect)
 {
 
 static int update_auto_abbrev(int auto_abbrev, struct blame_origin *suspect)
 {

-       const char *uniq = find_unique_abbrev(suspect->commit->object.oid.hash,
+       const char *uniq = find_unique_abbrev(&suspect->commit->object.oid,

                                              auto_abbrev);
        int len = strlen(uniq);
        if (auto_abbrev < len)
                                              auto_abbrev);
        int len = strlen(uniq);
        if (auto_abbrev < len)

diff --git a/builtin/branch.c b/builtin/branch.c
index 8dcc2ed058be6e653f885e48c9aa5f465a5f9749..659deb36f372ef3608eb4fd426e2b954103b822e 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -273,7 +273,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
                               bname.buf,
                               (flags & REF_ISBROKEN) ? "broken"
                               : (flags & REF_ISSYMREF) ? target
                               bname.buf,
                               (flags & REF_ISBROKEN) ? "broken"
                               : (flags & REF_ISSYMREF) ? target

-                              : find_unique_abbrev(oid.hash, DEFAULT_ABBREV));
+                              : find_unique_abbrev(&oid, DEFAULT_ABBREV));

                }
                delete_branch_config(bname.buf);
 
                }
                delete_branch_config(bname.buf);
 

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 5981e1a3eddb1510052deeb540117cd80d4bd8d1..45968c2d85f2e204f450a616a62dd8f26097c6cc 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -405,10 +405,10 @@ static void describe_detached_head(const char *msg, struct commit *commit)
                pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb);
        if (print_sha1_ellipsis()) {
                fprintf(stderr, "%s %s... %s\n", msg,
                pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb);
        if (print_sha1_ellipsis()) {
                fprintf(stderr, "%s %s... %s\n", msg,

-                       find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf);
+                       find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf);

        } else {
                fprintf(stderr, "%s %s %s\n", msg,
        } else {
                fprintf(stderr, "%s %s %s\n", msg,

-                       find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf);
+                       find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV), sb.buf);

        }
        strbuf_release(&sb);
 }
        }
        strbuf_release(&sb);
 }


@@ -778,7 +778,7 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
                        " git branch <new-branch-name> %s\n\n",
                        /* Give ngettext() the count */
                        lost),
                        " git branch <new-branch-name> %s\n\n",
                        /* Give ngettext() the count */
                        lost),

-                       find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
+                       find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));

 }
 
 /*
 }
 
 /*

diff --git a/builtin/describe.c b/builtin/describe.c
index e4869df7b434845544dfcc0c37cae6a77cd42dad..7e6535a8bd372ef1f560ea8ecf5f957740cd5e42 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -285,7 +285,7 @@ static void append_name(struct commit_name *n, struct strbuf *dst)
 
 static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst)
 {
 
 static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst)
 {

-       strbuf_addf(dst, "-%d-g%s", depth, find_unique_abbrev(oid->hash, abbrev));
+       strbuf_addf(dst, "-%d-g%s", depth, find_unique_abbrev(oid, abbrev));

 }
 
 static void describe_commit(struct object_id *oid, struct strbuf *dst)
 }
 
 static void describe_commit(struct object_id *oid, struct strbuf *dst)


@@ -383,7 +383,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
        if (!match_cnt) {
                struct object_id *cmit_oid = &cmit->object.oid;
                if (always) {
        if (!match_cnt) {
                struct object_id *cmit_oid = &cmit->object.oid;
                if (always) {

-                       strbuf_add_unique_abbrev(dst, cmit_oid->hash, abbrev);
+                       strbuf_add_unique_abbrev(dst, cmit_oid, abbrev);

                        if (suffix)
                                strbuf_addstr(dst, suffix);
                        return;
                        if (suffix)
                                strbuf_addstr(dst, suffix);
                        return;

diff --git a/builtin/log.c b/builtin/log.c
index 32a744bfd2062e93a3b7047eb3bc905ca9dbe047..411339c1ed22a3fe00309c08b9a007da862051cb 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1873,12 +1873,12 @@ static void print_commit(char sign, struct commit *commit, int verbose,
 {
        if (!verbose) {
                fprintf(file, "%c %s\n", sign,
 {
        if (!verbose) {
                fprintf(file, "%c %s\n", sign,

-                      find_unique_abbrev(commit->object.oid.hash, abbrev));
+                      find_unique_abbrev(&commit->object.oid, abbrev));

        } else {
                struct strbuf buf = STRBUF_INIT;
                pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
                fprintf(file, "%c %s %s\n", sign,
        } else {
                struct strbuf buf = STRBUF_INIT;
                pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
                fprintf(file, "%c %s %s\n", sign,

-                      find_unique_abbrev(commit->object.oid.hash, abbrev),
+                      find_unique_abbrev(&commit->object.oid, abbrev),

                       buf.buf);
                strbuf_release(&buf);
        }
                       buf.buf);
                strbuf_release(&buf);
        }

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 9df66ba307356e732c2fad6526b15d97ec868b45..a71f6bd088a2666f0637463e1c168171dd319a96 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -240,7 +240,7 @@ static void show_ce(struct repository *repo, struct dir_struct *dir,
                        printf("%s%06o %s %d\t",
                               tag,
                               ce->ce_mode,
                        printf("%s%06o %s %d\t",
                               tag,
                               ce->ce_mode,

-                              find_unique_abbrev(ce->oid.hash, abbrev),
+                              find_unique_abbrev(&ce->oid, abbrev),

                               ce_stage(ce));
                }
                write_eolinfo(repo->index, ce, fullname);
                               ce_stage(ce));
                }
                write_eolinfo(repo->index, ce, fullname);


@@ -271,7 +271,7 @@ static void show_ru_info(const struct index_state *istate)
                        if (!ui->mode[i])
                                continue;
                        printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
                        if (!ui->mode[i])
                                continue;
                        printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],

-                              find_unique_abbrev(ui->oid[i].hash, abbrev),
+                              find_unique_abbrev(&ui->oid[i], abbrev),

                               i + 1);
                        write_name(path);
                }
                               i + 1);
                        write_name(path);
                }

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index c613dd7b8269c537679718dc78eedc6d8c3c9d06..c98253adbb41737d0ec7c632c17ec5c0efd098ca 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -103,11 +103,11 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
                        } else
                                xsnprintf(size_text, sizeof(size_text), "-");
                        printf("%06o %s %s %7s\t", mode, type,
                        } else
                                xsnprintf(size_text, sizeof(size_text), "-");
                        printf("%06o %s %s %7s\t", mode, type,

-                              find_unique_abbrev(oid->hash, abbrev),
+                              find_unique_abbrev(oid, abbrev),

                               size_text);
                } else
                        printf("%06o %s %s\t", mode, type,
                               size_text);
                } else
                        printf("%06o %s %s\t", mode, type,

-                              find_unique_abbrev(oid->hash, abbrev));
+                              find_unique_abbrev(oid, abbrev));

        }
        baselen = base->len;
        strbuf_addstr(base, pathname);
        }
        baselen = base->len;
        strbuf_addstr(base, pathname);

diff --git a/builtin/merge.c b/builtin/merge.c
index 0c7437f53677b6cef7e9d65334aa93fe3b052f76..b4f32105b5ddaa6ecb346f5926b34105ada3f066 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1327,7 +1327,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
                        check_commit_signature(commit, &signature_check);
 
 
                        check_commit_signature(commit, &signature_check);
 

-                       find_unique_abbrev_r(hex, commit->object.oid.hash, DEFAULT_ABBREV);
+                       find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);

                        switch (signature_check.result) {
                        case 'G':
                                break;
                        switch (signature_check.result) {
                        case 'G':
                                break;


@@ -1420,9 +1420,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
                if (verbosity >= 0) {
                        printf(_("Updating %s..%s\n"),
 
                if (verbosity >= 0) {
                        printf(_("Updating %s..%s\n"),

-                              find_unique_abbrev(head_commit->object.oid.hash,
+                              find_unique_abbrev(&head_commit->object.oid,

                                                  DEFAULT_ABBREV),
                                                  DEFAULT_ABBREV),

-                              find_unique_abbrev(remoteheads->item->object.oid.hash,
+                              find_unique_abbrev(&remoteheads->item->object.oid,

                                                  DEFAULT_ABBREV));
                }
                strbuf_addstr(&msg, "Fast-forward");
                                                  DEFAULT_ABBREV));
                }
                strbuf_addstr(&msg, "Fast-forward");

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 9e088ebd11dced248640df9e17adbbd8b9a73ffb..387ddf85d21a443f060dbb212fe95a983d9e4f58 100644 (file)
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -328,7 +328,7 @@ static void show_name(const struct object *obj,
        else if (allow_undefined)
                printf("undefined\n");
        else if (always)
        else if (allow_undefined)
                printf("undefined\n");
        else if (always)

-               printf("%s\n", find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
+               printf("%s\n", find_unique_abbrev(oid, DEFAULT_ABBREV));

        else
                die("cannot describe '%s'", oid_to_hex(oid));
        strbuf_release(&buf);
        else
                die("cannot describe '%s'", oid_to_hex(oid));
        strbuf_release(&buf);

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 75e7f18aceffc42b5fdc58296559c67d47203098..2bf7f2d1a3e589f982400fef1aa5bec6e97ccfbd 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1242,11 +1242,11 @@ static void check_aliased_update(struct command *cmd, struct string_list *list)
        rp_error("refusing inconsistent update between symref '%s' (%s..%s) and"
                 " its target '%s' (%s..%s)",
                 cmd->ref_name,
        rp_error("refusing inconsistent update between symref '%s' (%s..%s) and"
                 " its target '%s' (%s..%s)",
                 cmd->ref_name,

-                find_unique_abbrev(cmd->old_oid.hash, DEFAULT_ABBREV),
-                find_unique_abbrev(cmd->new_oid.hash, DEFAULT_ABBREV),
+                find_unique_abbrev(&cmd->old_oid, DEFAULT_ABBREV),
+                find_unique_abbrev(&cmd->new_oid, DEFAULT_ABBREV),

                 dst_cmd->ref_name,
                 dst_cmd->ref_name,

-                find_unique_abbrev(dst_cmd->old_oid.hash, DEFAULT_ABBREV),
-                find_unique_abbrev(dst_cmd->new_oid.hash, DEFAULT_ABBREV));
+                find_unique_abbrev(&dst_cmd->old_oid, DEFAULT_ABBREV),
+                find_unique_abbrev(&dst_cmd->new_oid, DEFAULT_ABBREV));

 
        cmd->error_string = dst_cmd->error_string =
                "inconsistent aliased update";
 
        cmd->error_string = dst_cmd->error_string =
                "inconsistent aliased update";

diff --git a/builtin/reset.c b/builtin/reset.c
index 5da0f75de95cc9dc19db7d53a5e4df5140845082..7f1c3f02a302128d6c00c35b8783c1a62353b37a 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -109,7 +109,7 @@ static void print_new_head_line(struct commit *commit)
        struct strbuf buf = STRBUF_INIT;
 
        printf(_("HEAD is now at %s"),
        struct strbuf buf = STRBUF_INIT;
 
        printf(_("HEAD is now at %s"),

-               find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
+               find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));

 
        pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
        if (buf.len > 0)
 
        pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
        if (buf.len > 0)

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index d320b6f1e3bcbcd429d5e2baa94b453035572db7..2fd72c0be5a643c98d97ff779e449541e48434cd 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -108,7 +108,7 @@ static void show_commit(struct commit *commit, void *data)
        if (!revs->graph)
                fputs(get_revision_mark(revs, commit), stdout);
        if (revs->abbrev_commit && revs->abbrev)
        if (!revs->graph)
                fputs(get_revision_mark(revs, commit), stdout);
        if (revs->abbrev_commit && revs->abbrev)

-               fputs(find_unique_abbrev(commit->object.oid.hash, revs->abbrev),
+               fputs(find_unique_abbrev(&commit->object.oid, revs->abbrev),

                      stdout);
        else
                fputs(oid_to_hex(&commit->object.oid), stdout);
                      stdout);
        else
                fputs(oid_to_hex(&commit->object.oid), stdout);

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index a1e680b5e912beeed183dc271b0ae970a45a4814..36b208778280e6019d9bc4fb4063dff3d44f08e6 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -159,7 +159,7 @@ static void show_rev(int type, const struct object_id *oid, const char *name)
                }
        }
        else if (abbrev)
                }
        }
        else if (abbrev)

-               show_with_type(type, find_unique_abbrev(oid->hash, abbrev));
+               show_with_type(type, find_unique_abbrev(oid, abbrev));

        else
                show_with_type(type, oid_to_hex(oid));
 }
        else
                show_with_type(type, oid_to_hex(oid));
 }

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index e8a4aa40cb4b6cf8787af3dd35d833a92a85bba3..6c2148b71db593af1a4ef8d2d1bdbdfe16661851 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -292,7 +292,7 @@ static void show_one_commit(struct commit *commit, int no_name)
                }
                else
                        printf("[%s] ",
                }
                else
                        printf("[%s] ",

-                              find_unique_abbrev(commit->object.oid.hash,
+                              find_unique_abbrev(&commit->object.oid,

                                                  DEFAULT_ABBREV));
        }
        puts(pretty_str);
                                                  DEFAULT_ABBREV));
        }
        puts(pretty_str);

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 41e5e71cad660d26ddc90ffeaa383fd7bf10f79f..f2eb1a7724058bb1db237a6199d16e5ff1ef495a 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -29,7 +29,7 @@ static void show_one(const char *refname, const struct object_id *oid)
        if (quiet)
                return;
 
        if (quiet)
                return;
 

-       hex = find_unique_abbrev(oid->hash, abbrev);
+       hex = find_unique_abbrev(oid, abbrev);

        if (hash_only)
                printf("%s\n", hex);
        else
        if (hash_only)
                printf("%s\n", hex);
        else


@@ -39,7 +39,7 @@ static void show_one(const char *refname, const struct object_id *oid)
                return;
 
        if (!peel_ref(refname, &peeled)) {
                return;
 
        if (!peel_ref(refname, &peeled)) {

-               hex = find_unique_abbrev(peeled.hash, abbrev);
+               hex = find_unique_abbrev(&peeled, abbrev);

                printf("%s %s^{}\n", hex, refname);
        }
 }
                printf("%s %s^{}\n", hex, refname);
        }
 }

diff --git a/builtin/tag.c b/builtin/tag.c
index a5fc6c090fe97e06d022f1fe56e9a4d906ffed20..644e6888be2ef609f26acaadcefa5c5e8226b5fe 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -99,7 +99,8 @@ static int delete_tag(const char *name, const char *ref,
 {
        if (delete_ref(NULL, ref, oid, 0))
                return 1;
 {
        if (delete_ref(NULL, ref, oid, 0))
                return 1;

-       printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
+       printf(_("Deleted tag '%s' (was %s)\n"), name,
+              find_unique_abbrev(oid, DEFAULT_ABBREV));

        return 0;
 }
 
        return 0;
 }
 


@@ -558,7 +559,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                die("%s", err.buf);
        ref_transaction_free(transaction);
        if (force && !is_null_oid(&prev) && oidcmp(&prev, &object))
                die("%s", err.buf);
        ref_transaction_free(transaction);
        if (force && !is_null_oid(&prev) && oidcmp(&prev, &object))

-               printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev.hash, DEFAULT_ABBREV));
+               printf(_("Updated tag '%s' (was %s)\n"), tag,
+                      find_unique_abbrev(&prev, DEFAULT_ABBREV));

 
        UNLEAK(buf);
        UNLEAK(ref);
 
        UNLEAK(buf);
        UNLEAK(ref);

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 4e7c98758fcfb93c19e3dbf58fc3167829e998b8..3442f257b7d1029ac3ff09ff2ef2107b3ef233e3 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -498,7 +498,7 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
                strbuf_addstr(&sb, "(bare)");
        else {
                strbuf_addf(&sb, "%-*s ", abbrev_len,
                strbuf_addstr(&sb, "(bare)");
        else {
                strbuf_addf(&sb, "%-*s ", abbrev_len,

-                               find_unique_abbrev(wt->head_oid.hash, DEFAULT_ABBREV));
+                               find_unique_abbrev(&wt->head_oid, DEFAULT_ABBREV));

                if (wt->is_detached)
                        strbuf_addstr(&sb, "(detached HEAD)");
                else if (wt->head_ref) {
                if (wt->is_detached)
                        strbuf_addstr(&sb, "(detached HEAD)");
                else if (wt->head_ref) {


@@ -523,7 +523,7 @@ static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen)
 
                if (path_len > *maxlen)
                        *maxlen = path_len;
 
                if (path_len > *maxlen)
                        *maxlen = path_len;

-               sha1_len = strlen(find_unique_abbrev(wt[i]->head_oid.hash, *abbrev));
+               sha1_len = strlen(find_unique_abbrev(&wt[i]->head_oid, *abbrev));

                if (sha1_len > *abbrev)
                        *abbrev = sha1_len;
        }
                if (sha1_len > *abbrev)
                        *abbrev = sha1_len;
        }

diff --git a/cache.h b/cache.h
index d06932ed0bd049c8d41906da3508725c8978aa1c..fe8b2c2676837f4b706f5e18db1e30056b7b59ba 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -951,14 +951,14 @@ extern void sha1_file_name(struct strbuf *buf, const unsigned char *sha1);
  * more calls to find_unique_abbrev are made.
  *
  * The `_r` variant writes to a buffer supplied by the caller, which must be at
  * more calls to find_unique_abbrev are made.
  *
  * The `_r` variant writes to a buffer supplied by the caller, which must be at

- * least `GIT_SHA1_HEXSZ + 1` bytes. The return value is the number of bytes
+ * least `GIT_MAX_HEXSZ + 1` bytes. The return value is the number of bytes

  * written (excluding the NUL terminator).
  *
  * Note that while this version avoids the static buffer, it is not fully
  * reentrant, as it calls into other non-reentrant git code.
  */
  * written (excluding the NUL terminator).
  *
  * Note that while this version avoids the static buffer, it is not fully
  * reentrant, as it calls into other non-reentrant git code.
  */

-extern const char *find_unique_abbrev(const unsigned char *sha1, int len);
-extern int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len);
+extern const char *find_unique_abbrev(const struct object_id *oid, int len);
+extern int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len);

 
 extern const unsigned char null_sha1[GIT_MAX_RAWSZ];
 extern const struct object_id null_oid;
 
 extern const unsigned char null_sha1[GIT_MAX_RAWSZ];
 extern const struct object_id null_oid;

diff --git a/combine-diff.c b/combine-diff.c
index 1ec9af1f813968830ee153e23a4670014124683f..cf55f03b75e43adf8c0200fca816adafa4b796ff 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -915,11 +915,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++) {
                         "", 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.hash,
+               abb = find_unique_abbrev(&elem->parent[i].oid,

                                         abbrev);
                printf("%s%s", i ? "," : "", abb);
        }
                                         abbrev);
                printf("%s%s", i ? "," : "", abb);
        }

-       abb = find_unique_abbrev(elem->oid.hash, abbrev);
+       abb = find_unique_abbrev(&elem->oid, abbrev);

        printf("..%s%s\n", abb, c_reset);
 
        if (mode_differs) {
        printf("..%s%s\n", abb, c_reset);
 
        if (mode_differs) {

diff --git a/diff.c b/diff.c
index 915f4d6e9f8e4ce203221ebfe2ae9e6dc78b22c3..8184ecfc2abdbf76006894d3cb2c3b21279c9576 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3811,7 +3811,7 @@ static int similarity_index(struct diff_filepair *p)
 static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
 {
        if (startup_info->have_repository)
 static const char *diff_abbrev_oid(const struct object_id *oid, int abbrev)
 {
        if (startup_info->have_repository)

-               return find_unique_abbrev(oid->hash, abbrev);
+               return find_unique_abbrev(oid, abbrev);

        else {
                char *hex = oid_to_hex(oid);
                if (abbrev < 0)
        else {
                char *hex = oid_to_hex(oid);
                if (abbrev < 0)

diff --git a/log-tree.c b/log-tree.c
index bdf23c5f7b89eda2997057285d1fff64acb0d30c..d1c0bedf244fce0c8894175bf800384c0474b312 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -177,7 +177,7 @@ static void show_parents(struct commit *commit, int abbrev, FILE *file)
        struct commit_list *p;
        for (p = commit->parents; p ; p = p->next) {
                struct commit *parent = p->item;
        struct commit_list *p;
        for (p = commit->parents; p ; p = p->next) {
                struct commit *parent = p->item;

-               fprintf(file, " %s", find_unique_abbrev(parent->object.oid.hash, abbrev));
+               fprintf(file, " %s", find_unique_abbrev(&parent->object.oid, abbrev));

        }
 }
 
        }
 }
 


@@ -185,7 +185,7 @@ static void show_children(struct rev_info *opt, struct commit *commit, int abbre
 {
        struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
        for ( ; p; p = p->next) {
 {
        struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
        for ( ; p; p = p->next) {

-               fprintf(opt->diffopt.file, " %s", find_unique_abbrev(p->item->object.oid.hash, abbrev));
+               fprintf(opt->diffopt.file, " %s", find_unique_abbrev(&p->item->object.oid, abbrev));

        }
 }
 
        }
 }
 


@@ -558,7 +558,7 @@ void show_log(struct rev_info *opt)
 
                if (!opt->graph)
                        put_revision_mark(opt, commit);
 
                if (!opt->graph)
                        put_revision_mark(opt, commit);

-               fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit), opt->diffopt.file);
+               fputs(find_unique_abbrev(&commit->object.oid, abbrev_commit), opt->diffopt.file);

                if (opt->print_parents)
                        show_parents(commit, abbrev_commit, opt->diffopt.file);
                if (opt->children.name)
                if (opt->print_parents)
                        show_parents(commit, abbrev_commit, opt->diffopt.file);
                if (opt->children.name)


@@ -620,7 +620,8 @@ void show_log(struct rev_info *opt)
 
                if (!opt->graph)
                        put_revision_mark(opt, commit);
 
                if (!opt->graph)
                        put_revision_mark(opt, commit);

-               fputs(find_unique_abbrev(commit->object.oid.hash, abbrev_commit),
+               fputs(find_unique_abbrev(&commit->object.oid,
+                                        abbrev_commit),

                      opt->diffopt.file);
                if (opt->print_parents)
                        show_parents(commit, abbrev_commit, opt->diffopt.file);
                      opt->diffopt.file);
                if (opt->print_parents)
                        show_parents(commit, abbrev_commit, opt->diffopt.file);


@@ -628,8 +629,7 @@ void show_log(struct rev_info *opt)
                        show_children(opt, commit, abbrev_commit);
                if (parent)
                        fprintf(opt->diffopt.file, " (from %s)",
                        show_children(opt, commit, abbrev_commit);
                if (parent)
                        fprintf(opt->diffopt.file, " (from %s)",

-                              find_unique_abbrev(parent->object.oid.hash,
-                                                 abbrev_commit));
+                              find_unique_abbrev(&parent->object.oid, abbrev_commit));

                fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file);
                show_decorations(opt, commit);
                if (opt->commit_format == CMIT_FMT_ONELINE) {
                fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file);
                show_decorations(opt, commit);
                if (opt->commit_format == CMIT_FMT_ONELINE) {

diff --git a/ref-filter.c b/ref-filter.c
index dbe554dffa7292bbb25ad713aa99405e0560dc36..ca2bc7e6b21a34aa684a8deae21c0d46b17f09bf 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -742,13 +742,13 @@ static int grab_objectname(const char *name, const struct object_id *oid,
 {
        if (starts_with(name, "objectname")) {
                if (atom->u.objectname.option == O_SHORT) {
 {
        if (starts_with(name, "objectname")) {
                if (atom->u.objectname.option == O_SHORT) {

-                       v->s = xstrdup(find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
+                       v->s = xstrdup(find_unique_abbrev(oid, DEFAULT_ABBREV));

                        return 1;
                } else if (atom->u.objectname.option == O_FULL) {
                        v->s = xstrdup(oid_to_hex(oid));
                        return 1;
                } else if (atom->u.objectname.option == O_LENGTH) {
                        return 1;
                } else if (atom->u.objectname.option == O_FULL) {
                        v->s = xstrdup(oid_to_hex(oid));
                        return 1;
                } else if (atom->u.objectname.option == O_LENGTH) {

-                       v->s = xstrdup(find_unique_abbrev(oid->hash, atom->u.objectname.length));
+                       v->s = xstrdup(find_unique_abbrev(oid, atom->u.objectname.length));

                        return 1;
                } else
                        die("BUG: unknown %%(objectname) option");
                        return 1;
                } else
                        die("BUG: unknown %%(objectname) option");

diff --git a/sequencer.c b/sequencer.c
index c8160e974d7ee6bcef8cb26c098decf616413c2c..c994392caf63b77407306e7bece845d2c52f8ac3 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -282,7 +282,7 @@ struct commit_message {
 
 static const char *short_commit_name(struct commit *commit)
 {
 
 static const char *short_commit_name(struct commit *commit)
 {

-       return find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
+       return find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV);

 }
 
 static int get_message(struct commit *commit, struct commit_message *out)
 }
 
 static int get_message(struct commit *commit, struct commit_message *out)

diff --git a/sha1_name.c b/sha1_name.c
index 735c1c0b8ec032b3aac8b6a8976dcdb09ba5e91d..b59f3ed7488f7455fc11d72d570d08eb8269c4f4 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -380,7 +380,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
        }
 
        advise("  %s %s%s",
        }
 
        advise("  %s %s%s",

-              find_unique_abbrev(oid->hash, DEFAULT_ABBREV),
+              find_unique_abbrev(oid, DEFAULT_ABBREV),

               type_name(type) ? type_name(type) : "unknown type",
               desc.buf);
 
               type_name(type) ? type_name(type) : "unknown type",
               desc.buf);
 


@@ -569,7 +569,7 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
                find_abbrev_len_for_pack(p, mad);
 }
 
                find_abbrev_len_for_pack(p, mad);
 }
 

-int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
+int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len)

 {
        struct disambiguate_state ds;
        struct min_abbrev_data mad;
 {
        struct disambiguate_state ds;
        struct min_abbrev_data mad;


@@ -596,14 +596,14 @@ int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
                        len = FALLBACK_DEFAULT_ABBREV;
        }
 
                        len = FALLBACK_DEFAULT_ABBREV;
        }
 

-       sha1_to_hex_r(hex, sha1);
+       oid_to_hex_r(hex, oid);

        if (len == GIT_SHA1_HEXSZ || !len)
                return GIT_SHA1_HEXSZ;
 
        mad.init_len = len;
        mad.cur_len = len;
        mad.hex = hex;
        if (len == GIT_SHA1_HEXSZ || !len)
                return GIT_SHA1_HEXSZ;
 
        mad.init_len = len;
        mad.cur_len = len;
        mad.hex = hex;

-       mad.hash = sha1;
+       mad.hash = oid->hash;

 
        find_abbrev_len_packed(&mad);
 
 
        find_abbrev_len_packed(&mad);
 


@@ -621,13 +621,13 @@ int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
        return mad.cur_len;
 }
 
        return mad.cur_len;
 }
 

-const char *find_unique_abbrev(const unsigned char *sha1, int len)
+const char *find_unique_abbrev(const struct object_id *oid, int len)

 {
        static int bufno;
        static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
        char *hex = hexbuffer[bufno];
        bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);
 {
        static int bufno;
        static char hexbuffer[4][GIT_MAX_HEXSZ + 1];
        char *hex = hexbuffer[bufno];
        bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer);

-       find_unique_abbrev_r(hex, sha1, len);
+       find_unique_abbrev_r(hex, oid, len);

        return hex;
 }
 
        return hex;
 }
 

diff --git a/strbuf.c b/strbuf.c
index 07309045ef6679cdbb8024494c82b16237524e66..aa97ad09197b4847329a58a72fd6022cc1742043 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -878,7 +878,7 @@ void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
 {
        int r;
        strbuf_grow(sb, GIT_SHA1_HEXSZ + 1);
 {
        int r;
        strbuf_grow(sb, GIT_SHA1_HEXSZ + 1);

-       r = find_unique_abbrev_r(sb->buf + sb->len, oid->hash, abbrev_len);
+       r = find_unique_abbrev_r(sb->buf + sb->len, oid, abbrev_len);

        strbuf_setlen(sb, sb->len + r);
 }
 
        strbuf_setlen(sb, sb->len + r);
 }
 

diff --git a/tag.c b/tag.c
index 66210fd4772778ac4c95925ec4670717dd27da62..a6e0abce67c6b10b37fb9540061e8746dff051ce 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -46,7 +46,7 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
                return error("%s: cannot verify a non-tag object of type %s.",
                                name_to_report ?
                                name_to_report :
                return error("%s: cannot verify a non-tag object of type %s.",
                                name_to_report ?
                                name_to_report :

-                               find_unique_abbrev(oid->hash, DEFAULT_ABBREV),
+                               find_unique_abbrev(oid, DEFAULT_ABBREV),

                                type_name(type));
 
        buf = read_sha1_file(oid->hash, &type, &size);
                                type_name(type));
 
        buf = read_sha1_file(oid->hash, &type, &size);


@@ -54,7 +54,7 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
                return error("%s: unable to read file.",
                                name_to_report ?
                                name_to_report :
                return error("%s: unable to read file.",
                                name_to_report ?
                                name_to_report :

-                               find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
+                               find_unique_abbrev(oid, DEFAULT_ABBREV));

 
        ret = run_gpg_verify(buf, size, flags);
 
 
        ret = run_gpg_verify(buf, size, flags);
 

diff --git a/transport.c b/transport.c
index 87de35dd5e9c82e3c9d87dd2d6e86e02a2364561..b9dfa11bd2a1f849f2c2d33aa4943a1ea9cb2d8b 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -461,7 +461,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count,
 static int measure_abbrev(const struct object_id *oid, int sofar)
 {
        char hex[GIT_MAX_HEXSZ + 1];
 static int measure_abbrev(const struct object_id *oid, int sofar)
 {
        char hex[GIT_MAX_HEXSZ + 1];

-       int w = find_unique_abbrev_r(hex, oid->hash, DEFAULT_ABBREV);
+       int w = find_unique_abbrev_r(hex, oid, DEFAULT_ABBREV);

 
        return (w < sofar) ? sofar : w;
 }
 
        return (w < sofar) ? sofar : w;
 }

diff --git a/wt-status.c b/wt-status.c
index 78be89a4222bb3e29af930735f32a39d8ac17ee2..50815e5faffba0e9df861dbc4881e9fbffd7a941 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1350,7 +1350,7 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
                                        const char *color)
 {
        status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
                                        const char *color)
 {
        status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),

-                       find_unique_abbrev(state->cherry_pick_head_oid.hash, DEFAULT_ABBREV));
+                       find_unique_abbrev(&state->cherry_pick_head_oid, DEFAULT_ABBREV));

        if (s->hints) {
                if (has_unmerged(s))
                        status_printf_ln(s, color,
        if (s->hints) {
                if (has_unmerged(s))
                        status_printf_ln(s, color,


@@ -1369,7 +1369,7 @@ static void show_revert_in_progress(struct wt_status *s,
                                        const char *color)
 {
        status_printf_ln(s, color, _("You are currently reverting commit %s."),
                                        const char *color)
 {
        status_printf_ln(s, color, _("You are currently reverting commit %s."),

-                        find_unique_abbrev(state->revert_head_oid.hash, DEFAULT_ABBREV));
+                        find_unique_abbrev(&state->revert_head_oid, DEFAULT_ABBREV));

        if (s->hints) {
                if (has_unmerged(s))
                        status_printf_ln(s, color,
        if (s->hints) {
                if (has_unmerged(s))
                        status_printf_ln(s, color,


@@ -1489,7 +1489,7 @@ static void wt_status_get_detached_from(struct wt_status_state *state)
                state->detached_from = xstrdup(from);
        } else
                state->detached_from =
                state->detached_from = xstrdup(from);
        } else
                state->detached_from =

-                       xstrdup(find_unique_abbrev(cb.noid.hash, DEFAULT_ABBREV));
+                       xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV));

        oidcpy(&state->detached_oid, &cb.noid);
        state->detached_at = !get_oid("HEAD", &oid) &&
                             !oidcmp(&oid, &state->detached_oid);
        oidcpy(&state->detached_oid, &cb.noid);
        state->detached_at = !get_oid("HEAD", &oid) &&
                             !oidcmp(&oid, &state->detached_oid);