Browse Source

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>
maint
Miklos Vajna 17 years ago committed by Junio C Hamano
parent
commit
89cf4c7004
  1. 3
      remote.c
  2. 7
      remote.h

3
remote.c

@ -201,6 +201,7 @@ static void read_remotes_file(struct remote *remote) @@ -201,6 +201,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 +262,7 @@ static void read_branches_file(struct remote *remote) @@ -261,6 +262,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;
@ -350,6 +352,7 @@ static int handle_config(const char *key, const char *value, void *cb) @@ -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);
remote->origin = REMOTE_CONFIG;
if (!strcmp(subkey, ".mirror"))
remote->mirror = git_config_bool(key, value);
else if (!strcmp(subkey, ".skipdefaultupdate"))

7
remote.h

@ -1,8 +1,15 @@ @@ -1,8 +1,15 @@
#ifndef REMOTE_H
#define REMOTE_H

enum {
REMOTE_CONFIG,
REMOTE_REMOTES,
REMOTE_BRANCHES
};

struct remote {
const char *name;
int origin;

const char **url;
int url_nr;

Loading…
Cancel
Save