detect close failure on just-written file handles

[git.git] / remote.c

diff --git a/remote.c b/remote.c
index 754d5130e3895acc59e43eb1d46338a835ad72ef..500ca4d968753485ac38d44e238e93ab86372c1c 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -546,13 +546,14 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
                }
 
                if (pat) {
-                       dst_name = xmalloc(strlen(pat->dst) +
+                       const char *dst_side = pat->dst ? pat->dst : pat->src;
+                       dst_name = xmalloc(strlen(dst_side) +
                                           strlen(src->name) -
                                           strlen(pat->src) + 2);
-                       strcpy(dst_name, pat->dst);
+                       strcpy(dst_name, dst_side);
                        strcat(dst_name, src->name + strlen(pat->src));
                } else
-                       dst_name = strdup(src->name);
+                       dst_name = xstrdup(src->name);
                dst_peer = find_ref_by_name(dst, dst_name);
                if (dst_peer && dst_peer->peer_ref)
                        /* We're already sending something to this ref. */