object-name.h: move declarations for object-name.c functions from cache.h

[thirdparty/git.git] / builtin / show-branch.c

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index c013abaf94251bd3b37027e8ab48917a4feb099b..20030b75e39ffd8cae40b6a743f7e23f364364d8 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -1,10 +1,14 @@
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
+#include "gettext.h"
+#include "hex.h"
 #include "pretty.h"
 #include "refs.h"
 #include "builtin.h"
 #include "color.h"
 #include "strvec.h"
+#include "object-name.h"
 #include "parse-options.h"
 #include "dir.h"
 #include "commit-slab.h"
@@ -240,7 +244,7 @@ static void join_revs(struct commit_list **list_p,
                        parents = parents->next;
                        if ((this_flag & flags) == flags)
                                continue;
-                       parse_commit(p);
+                       repo_parse_commit(the_repository, p);
                        if (mark_seen(p, seen_p) && !still_interesting)
                                extra--;
                        p->object.flags |= flags;
@@ -312,8 +316,8 @@ static void show_one_commit(struct commit *commit, int no_name)
                }
                else
                        printf("[%s] ",
-                              find_unique_abbrev(&commit->object.oid,
-                                                 DEFAULT_ABBREV));
+                              repo_find_unique_abbrev(the_repository, &commit->object.oid,
+                                                      DEFAULT_ABBREV));
        }
        puts(pretty_str);
        strbuf_release(&pretty);
@@ -414,7 +418,7 @@ static int append_head_ref(const char *refname, const struct object_id *oid,
        /* If both heads/foo and tags/foo exists, get_sha1 would
         * get confused.
         */
-       if (get_oid(refname + ofs, &tmp) || !oideq(&tmp, oid))
+       if (repo_get_oid(the_repository, refname + ofs, &tmp) || !oideq(&tmp, oid))
                ofs = 5;
        return append_ref(refname + ofs, oid, 0);
 }
@@ -429,7 +433,7 @@ static int append_remote_ref(const char *refname, const struct object_id *oid,
        /* If both heads/foo and tags/foo exists, get_sha1 would
         * get confused.
         */
-       if (get_oid(refname + ofs, &tmp) || !oideq(&tmp, oid))
+       if (repo_get_oid(the_repository, refname + ofs, &tmp) || !oideq(&tmp, oid))
                ofs = 5;
        return append_ref(refname + ofs, oid, 0);
 }
@@ -533,7 +537,7 @@ static int show_independent(struct commit **rev,
 static void append_one_rev(const char *av)
 {
        struct object_id revkey;
-       if (!get_oid(av, &revkey)) {
+       if (!repo_get_oid(the_repository, av, &revkey)) {
                append_ref(av, &revkey, 0);
                return;
        }
@@ -746,7 +750,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                        die(Q_("only %d entry can be shown at one time.",
                               "only %d entries can be shown at one time.",
                               MAX_REVS), MAX_REVS);
-               if (!dwim_ref(*av, strlen(*av), &oid, &ref, 0))
+               if (!repo_dwim_ref(the_repository, *av, strlen(*av), &oid,
+                                  &ref, 0))
                        die(_("no such ref %s"), *av);
 
                /* Has the base been specified? */
@@ -836,13 +841,13 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                        die(Q_("cannot handle more than %d rev.",
                               "cannot handle more than %d revs.",
                               MAX_REVS), MAX_REVS);
-               if (get_oid(ref_name[num_rev], &revkey))
+               if (repo_get_oid(the_repository, ref_name[num_rev], &revkey))
                        die(_("'%s' is not a valid ref."), ref_name[num_rev]);
                commit = lookup_commit_reference(the_repository, &revkey);
                if (!commit)
                        die(_("cannot find commit %s (%s)"),
                            ref_name[num_rev], oid_to_hex(&revkey));
-               parse_commit(commit);
+               repo_parse_commit(the_repository, commit);
                mark_seen(commit, &seen);
 
                /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1,
@@ -956,5 +961,6 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                if (shown_merge_point && --extra < 0)
                        break;
        }
+       free(head);
        return 0;
 }