Docs: send-email: --smtp-server-port can take symbolic ports

diff --git a/remote.c b/remote.c
index 2b037f11b29d86e38d6608a58c65e79e0ffd3800..a06761ace8a2566746a5ebeedf6b3075f625c47b 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -667,6 +667,17 @@ struct remote *remote_get(const char *name)
        return ret;
 }
 
+int remote_is_configured(const char *name)
+{
+       int i;
+       read_config();
+
+       for (i = 0; i < remotes_nr; i++)
+               if (!strcmp(name, remotes[i]->name))
+                       return 1;
+       return 0;
+}
+
 int for_each_remote(each_remote_fn fn, void *priv)
 {
        int i, result = 0;
@@ -1170,8 +1181,9 @@ struct branch *branch_get(const char *name)
                        for (i = 0; i < ret->merge_nr; i++) {
                                ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
                                ret->merge[i]->src = xstrdup(ret->merge_name[i]);
-                               remote_find_tracking(ret->remote,
-                                                    ret->merge[i]);
+                               if (remote_find_tracking(ret->remote, ret->merge[i])
+                                   && !strcmp(ret->remote_name, "."))
+                                       ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
                        }
                }
        }
@@ -1451,6 +1463,8 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
        base = branch->merge[0]->dst;
        if (!prefixcmp(base, "refs/remotes/")) {
                base += strlen("refs/remotes/");
+       } else if (!prefixcmp(base, "refs/heads/")) {
+               base += strlen("refs/heads/");
        }
        if (!num_theirs)
                strbuf_addf(sb, "Your branch is ahead of '%s' "