builtin/show-branch: rewrite functions to work with object_id

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index b861e4192601f59a4537a1aa7e40b6398afa53f2..826d9fa5fbd6c42ecfac96963ae816a25f77780c 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -369,10 +369,10 @@ static void sort_ref_range(int bottom, int top)
              compare_ref_name);
 }
 
              compare_ref_name);
 }
 

-static int append_ref(const char *refname, const unsigned char *sha1,
+static int append_ref(const char *refname, const struct object_id *oid,

                      int allow_dups)
 {
                      int allow_dups)
 {

-       struct commit *commit = lookup_commit_reference_gently(sha1, 1);
+       struct commit *commit = lookup_commit_reference_gently(oid->hash, 1);

        int i;
 
        if (!commit)
        int i;
 
        if (!commit)


@@ -406,7 +406,7 @@ static int append_head_ref(const char *refname, const struct object_id *oid,
         */
        if (get_sha1(refname + ofs, tmp.hash) || oidcmp(&tmp, oid))
                ofs = 5;
         */
        if (get_sha1(refname + ofs, tmp.hash) || oidcmp(&tmp, oid))
                ofs = 5;

-       return append_ref(refname + ofs, oid->hash, 0);
+       return append_ref(refname + ofs, oid, 0);

 }
 
 static int append_remote_ref(const char *refname, const struct object_id *oid,
 }
 
 static int append_remote_ref(const char *refname, const struct object_id *oid,


@@ -421,7 +421,7 @@ static int append_remote_ref(const char *refname, const struct object_id *oid,
         */
        if (get_sha1(refname + ofs, tmp.hash) || oidcmp(&tmp, oid))
                ofs = 5;
         */
        if (get_sha1(refname + ofs, tmp.hash) || oidcmp(&tmp, oid))
                ofs = 5;

-       return append_ref(refname + ofs, oid->hash, 0);
+       return append_ref(refname + ofs, oid, 0);

 }
 
 static int append_tag_ref(const char *refname, const struct object_id *oid,
 }
 
 static int append_tag_ref(const char *refname, const struct object_id *oid,


@@ -429,7 +429,7 @@ static int append_tag_ref(const char *refname, const struct object_id *oid,
 {
        if (!starts_with(refname, "refs/tags/"))
                return 0;
 {
        if (!starts_with(refname, "refs/tags/"))
                return 0;

-       return append_ref(refname + 5, oid->hash, 0);
+       return append_ref(refname + 5, oid, 0);

 }
 
 static const char *match_ref_pattern = NULL;
 }
 
 static const char *match_ref_pattern = NULL;


@@ -463,7 +463,7 @@ static int append_matching_ref(const char *refname, const struct object_id *oid,
                return append_head_ref(refname, oid, flag, cb_data);
        if (starts_with(refname, "refs/tags/"))
                return append_tag_ref(refname, oid, flag, cb_data);
                return append_head_ref(refname, oid, flag, cb_data);
        if (starts_with(refname, "refs/tags/"))
                return append_tag_ref(refname, oid, flag, cb_data);

-       return append_ref(refname, oid->hash, 0);
+       return append_ref(refname, oid, 0);

 }
 
 static void snarf_refs(int head, int remotes)
 }
 
 static void snarf_refs(int head, int remotes)


@@ -538,7 +538,7 @@ static void append_one_rev(const char *av)
 {
        struct object_id revkey;
        if (!get_sha1(av, revkey.hash)) {
 {
        struct object_id revkey;
        if (!get_sha1(av, revkey.hash)) {

-               append_ref(av, revkey.hash, 0);
+               append_ref(av, &revkey, 0);

                return;
        }
        if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
                return;
        }
        if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {


@@ -643,7 +643,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
        char head[128];
        const char *head_p;
        int head_len;
        char head[128];
        const char *head_p;
        int head_len;

-       unsigned char head_sha1[20];
+       struct object_id head_oid;

        int merge_base = 0;
        int independent = 0;
        int no_name = 0;
        int merge_base = 0;
        int independent = 0;
        int no_name = 0;


@@ -729,7 +729,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                all_heads = 1;
 
        if (reflog) {
                all_heads = 1;
 
        if (reflog) {

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

                char nth_desc[256];
                char *ref;
                int base = 0;
                char nth_desc[256];
                char *ref;
                int base = 0;


@@ -740,7 +740,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 
                        fake_av[0] = resolve_refdup("HEAD",
                                                    RESOLVE_REF_READING,
 
                        fake_av[0] = resolve_refdup("HEAD",
                                                    RESOLVE_REF_READING,

-                                                   sha1, NULL);
+                                                   oid.hash, NULL);

                        fake_av[1] = NULL;
                        av = fake_av;
                        ac = 1;
                        fake_av[1] = NULL;
                        av = fake_av;
                        ac = 1;


@@ -751,7 +751,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                if (MAX_REVS < reflog)
                        die("Only %d entries can be shown at one time.",
                            MAX_REVS);
                if (MAX_REVS < reflog)
                        die("Only %d entries can be shown at one time.",
                            MAX_REVS);

-               if (!dwim_ref(*av, strlen(*av), sha1, &ref))
+               if (!dwim_ref(*av, strlen(*av), oid.hash, &ref))

                        die("No such ref %s", *av);
 
                /* Has the base been specified? */
                        die("No such ref %s", *av);
 
                /* Has the base been specified? */


@@ -762,7 +762,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                                /* Ah, that is a date spec... */
                                unsigned long at;
                                at = approxidate(reflog_base);
                                /* Ah, that is a date spec... */
                                unsigned long at;
                                at = approxidate(reflog_base);

-                               read_ref_at(ref, flags, at, -1, sha1, NULL,
+                               read_ref_at(ref, flags, at, -1, oid.hash, NULL,

                                            NULL, NULL, &base);
                        }
                }
                                            NULL, NULL, &base);
                        }
                }


@@ -773,7 +773,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                        unsigned long timestamp;
                        int tz;
 
                        unsigned long timestamp;
                        int tz;
 

-                       if (read_ref_at(ref, flags, 0, base+i, sha1, &logmsg,
+                       if (read_ref_at(ref, flags, 0, base+i, oid.hash, &logmsg,

                                        &timestamp, &tz, NULL)) {
                                reflog = i;
                                break;
                                        &timestamp, &tz, NULL)) {
                                reflog = i;
                                break;


@@ -788,7 +788,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                                                msg);
                        free(logmsg);
                        sprintf(nth_desc, "%s@{%d}", *av, base+i);
                                                msg);
                        free(logmsg);
                        sprintf(nth_desc, "%s@{%d}", *av, base+i);

-                       append_ref(nth_desc, sha1, 1);
+                       append_ref(nth_desc, &oid, 1);

                }
                free(ref);
        }
                }
                free(ref);
        }


@@ -802,7 +802,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
        }
 
        head_p = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
        }
 
        head_p = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,

-                                   head_sha1, NULL);
+                                   head_oid.hash, NULL);

        if (head_p) {
                head_len = strlen(head_p);
                memcpy(head, head_p, head_len + 1);
        if (head_p) {
                head_len = strlen(head_p);
                memcpy(head, head_p, head_len + 1);


@@ -821,7 +821,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                        if (rev_is_head(head,
                                        head_len,
                                        ref_name[i],
                        if (rev_is_head(head,
                                        head_len,
                                        ref_name[i],

-                                       head_sha1, NULL))
+                                       head_oid.hash, NULL))

                                has_head++;
                }
                if (!has_head) {
                                has_head++;
                }
                if (!has_head) {


@@ -836,17 +836,17 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
        }
 
        for (num_rev = 0; ref_name[num_rev]; num_rev++) {
        }
 
        for (num_rev = 0; ref_name[num_rev]; num_rev++) {

-               unsigned char revkey[20];
+               struct object_id revkey;

                unsigned int flag = 1u << (num_rev + REV_SHIFT);
 
                if (MAX_REVS <= num_rev)
                        die("cannot handle more than %d revs.", MAX_REVS);
                unsigned int flag = 1u << (num_rev + REV_SHIFT);
 
                if (MAX_REVS <= num_rev)
                        die("cannot handle more than %d revs.", MAX_REVS);

-               if (get_sha1(ref_name[num_rev], revkey))
+               if (get_sha1(ref_name[num_rev], revkey.hash))

                        die("'%s' is not a valid ref.", ref_name[num_rev]);
                        die("'%s' is not a valid ref.", ref_name[num_rev]);

-               commit = lookup_commit_reference(revkey);
+               commit = lookup_commit_reference(revkey.hash);

                if (!commit)
                        die("cannot find commit %s (%s)",
                if (!commit)
                        die("cannot find commit %s (%s)",

-                           ref_name[num_rev], revkey);
+                           ref_name[num_rev], revkey.hash);

                parse_commit(commit);
                mark_seen(commit, &seen);
 
                parse_commit(commit);
                mark_seen(commit, &seen);
 


@@ -880,7 +880,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                        int is_head = rev_is_head(head,
                                                  head_len,
                                                  ref_name[i],
                        int is_head = rev_is_head(head,
                                                  head_len,
                                                  ref_name[i],

-                                                 head_sha1,
+                                                 head_oid.hash,

                                                  rev[i]->object.sha1);
                        if (extra < 0)
                                printf("%c [%s] ",
                                                  rev[i]->object.sha1);
                        if (extra < 0)
                                printf("%c [%s] ",