remote: add a new 'origin' variable to the struct

This allows one to track where was the remote's original source, so that
it's possible to decide if it makes sense to migrate it to the config
format or not.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index e530a21e5c92e49012c459fba0eb7732672883c2..cbb3e484fe7803f68eae8507c8216ed951d0b54b 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -201,6 +201,7 @@ static void read_remotes_file(struct remote *remote)
 
        if (!f)
                return;
 
        if (!f)
                return;

+       remote->origin = REMOTE_REMOTES;

        while (fgets(buffer, BUF_SIZE, f)) {
                int value_list;
                char *s, *p;
        while (fgets(buffer, BUF_SIZE, f)) {
                int value_list;
                char *s, *p;


@@ -261,6 +262,7 @@ static void read_branches_file(struct remote *remote)
                s++;
        if (!*s)
                return;
                s++;
        if (!*s)
                return;

+       remote->origin = REMOTE_BRANCHES;

        p = s + strlen(s);
        while (isspace(p[-1]))
                *--p = 0;
        p = s + strlen(s);
        while (isspace(p[-1]))
                *--p = 0;


@@ -350,6 +352,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);
        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"))
        if (!strcmp(subkey, ".mirror"))
                remote->mirror = git_config_bool(key, value);
        else if (!strcmp(subkey, ".skipdefaultupdate"))

diff --git a/remote.h b/remote.h
index d2e170ce664c0efd9ded356c171dabf4b26e452c..a46a5be131caf1d1d71f97cab3c3ba2cebb6386c 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -1,8 +1,15 @@
 #ifndef REMOTE_H
 #define REMOTE_H
 
 #ifndef REMOTE_H
 #define REMOTE_H
 

+enum {
+       REMOTE_CONFIG,
+       REMOTE_REMOTES,
+       REMOTE_BRANCHES
+};
+

 struct remote {
        const char *name;
 struct remote {
        const char *name;

+       int origin;

 
        const char **url;
        int url_nr;
 
        const char **url;
        int url_nr;