Merge branch 'js/patience-diff'

[git.git] / remote.c

diff --git a/remote.c b/remote.c
index e530a21e5c92e49012c459fba0eb7732672883c2..d7079c6dd871dc1b482d347d013438fe30cc0908 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -4,6 +4,7 @@
 #include "commit.h"
 #include "diff.h"
 #include "revision.h"
+#include "dir.h"
 
 static struct refspec s_tag_refspec = {
        0,
@@ -201,6 +202,7 @@ static void read_remotes_file(struct remote *remote)
 
        if (!f)
                return;
+       remote->origin = REMOTE_REMOTES;
        while (fgets(buffer, BUF_SIZE, f)) {
                int value_list;
                char *s, *p;
@@ -261,6 +263,7 @@ static void read_branches_file(struct remote *remote)
                s++;
        if (!*s)
                return;
+       remote->origin = REMOTE_BRANCHES;
        p = s + strlen(s);
        while (isspace(p[-1]))
                *--p = 0;
@@ -297,6 +300,17 @@ static void read_branches_file(struct remote *remote)
        }
        add_url_alias(remote, p);
        add_fetch_refspec(remote, strbuf_detach(&branch, 0));
+       /*
+        * Cogito compatible push: push current HEAD to remote #branch
+        * (master if missing)
+        */
+       strbuf_init(&branch, 0);
+       strbuf_addstr(&branch, "HEAD");
+       if (frag)
+               strbuf_addf(&branch, ":refs/heads/%s", frag);
+       else
+               strbuf_addstr(&branch, ":refs/heads/master");
+       add_push_refspec(remote, strbuf_detach(&branch, 0));
        remote->fetch_tags = 1; /* always auto-follow */
 }
 
@@ -350,6 +364,7 @@ static int handle_config(const char *key, const char *value, void *cb)
        if (!subkey)
                return error("Config with no key for remote %s", name);
        remote = make_remote(name, subkey - name);
+       remote->origin = REMOTE_CONFIG;
        if (!strcmp(subkey, ".mirror"))
                remote->mirror = git_config_bool(key, value);
        else if (!strcmp(subkey, ".skipdefaultupdate"))
@@ -620,10 +635,7 @@ static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
 
 static int valid_remote_nick(const char *name)
 {
-       if (!name[0] || /* not empty */
-           (name[0] == '.' && /* not "." */
-            (!name[1] || /* not ".." */
-             (name[1] == '.' && !name[2]))))
+       if (!name[0] || is_dot_or_dotdot(name))
                return 0;
        return !strchr(name, '/'); /* no slash */
 }