builtin-branch: remove duplicated code

The previous optimization to --[no-]merged ended up with some duplicated
code which this patch removes.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-branch.c b/builtin-branch.c
index 5db8ad836ab9e717a6179458b950469a0ee6d329..675a9b163786672fb3f926247efb37a552d89060 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -214,7 +214,6 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
        struct commit *commit;
        int kind;
        int len;
        struct commit *commit;
        int kind;
        int len;

-       static struct commit_list branch;

 
        /* Detect kind */
        if (!prefixcmp(refname, "refs/heads/")) {
 
        /* Detect kind */
        if (!prefixcmp(refname, "refs/heads/")) {


@@ -238,13 +237,9 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
        if ((kind & ref_list->kinds) == 0)
                return 0;
 
        if ((kind & ref_list->kinds) == 0)
                return 0;
 

-       if (merge_filter != NO_FILTER) {
-               branch.item = lookup_commit_reference_gently(sha1, 1);
-               if (!branch.item)
-                       die("Unable to lookup tip of branch %s", refname);
+       if (merge_filter != NO_FILTER)

                add_pending_object(&ref_list->revs,
                add_pending_object(&ref_list->revs,

-                                  (struct object *)branch.item, refname);
-       }
+                                  (struct object *)commit, refname);

 
        /* Resize buffer */
        if (ref_list->index >= ref_list->alloc) {
 
        /* Resize buffer */
        if (ref_list->index >= ref_list->alloc) {