Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

[thirdparty/git.git] / remote.c

diff --git a/remote.c b/remote.c
index e2ca4d32bab79f2d3795fa8cbc6a70906c672f0e..170015aabfc18d028b22a5200cbddc5a5ec3f042 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -762,6 +762,8 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
                        hashcpy(dst_peer->new_sha1, src->new_sha1);
                }
                dst_peer->peer_ref = src;
+               if (pat)
+                       dst_peer->force = pat->force;
        free_name:
                free(dst_name);
        }
@@ -909,7 +911,8 @@ int get_fetch_map(struct ref *remote_refs,
                            rm->peer_ref->name);
        }
 
-       tail_link_ref(ref_map, tail);
+       if (ref_map)
+               tail_link_ref(ref_map, tail);
 
        return 0;
 }