am: suppress apply errors when using 3-way

diff --git a/builtin-remote.c b/builtin-remote.c
index d7ab6b2d5ff872c7872648bae4c97d7e1aa3ebba..dfc0b9e706507fc557cc2b593632fda4683387bc 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -295,17 +295,14 @@ static int get_push_ref_states(const struct ref *remote_refs,
        struct ref_states *states)
 {
        struct remote *remote = states->remote;
-       struct ref *ref, *local_refs, *push_map, **push_tail;
+       struct ref *ref, *local_refs, *push_map;
        if (remote->mirror)
                return 0;
 
        local_refs = get_local_heads();
        push_map = copy_ref_list(remote_refs);
 
-       push_tail = &push_map;
-       while (*push_tail)
-               push_tail = &((*push_tail)->next);
-       match_refs(local_refs, push_map, &push_tail, remote->push_refspec_nr,
+       match_refs(local_refs, &push_map, remote->push_refspec_nr,
                   remote->push_refspec, MATCH_REFS_NONE);
 
        states->push.strdup_strings = 1;