2007-05-12 19:45:53 +04:00
|
|
|
#include "cache.h"
|
|
|
|
#include "remote.h"
|
|
|
|
#include "refs.h"
|
2008-07-02 11:51:18 +04:00
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
2009-01-10 15:07:50 +03:00
|
|
|
#include "dir.h"
|
2009-02-25 11:32:12 +03:00
|
|
|
#include "tag.h"
|
2007-05-12 19:45:53 +04:00
|
|
|
|
2008-04-18 03:32:35 +04:00
|
|
|
static struct refspec s_tag_refspec = {
|
|
|
|
0,
|
|
|
|
1,
|
2008-05-26 00:38:44 +04:00
|
|
|
0,
|
2009-03-07 09:11:36 +03:00
|
|
|
"refs/tags/*",
|
|
|
|
"refs/tags/*"
|
2008-04-18 03:32:35 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
const struct refspec *tag_refspec = &s_tag_refspec;
|
|
|
|
|
2008-02-25 09:25:04 +03:00
|
|
|
struct counted_string {
|
|
|
|
size_t len;
|
|
|
|
const char *s;
|
|
|
|
};
|
2008-02-20 21:43:53 +03:00
|
|
|
struct rewrite {
|
|
|
|
const char *base;
|
2008-02-25 09:25:04 +03:00
|
|
|
size_t baselen;
|
|
|
|
struct counted_string *instead_of;
|
2008-02-20 21:43:53 +03:00
|
|
|
int instead_of_nr;
|
|
|
|
int instead_of_alloc;
|
|
|
|
};
|
|
|
|
|
2007-05-12 19:45:53 +04:00
|
|
|
static struct remote **remotes;
|
2008-02-19 07:41:41 +03:00
|
|
|
static int remotes_alloc;
|
|
|
|
static int remotes_nr;
|
2007-05-12 19:45:53 +04:00
|
|
|
|
2007-09-11 07:02:56 +04:00
|
|
|
static struct branch **branches;
|
2008-02-19 07:41:41 +03:00
|
|
|
static int branches_alloc;
|
|
|
|
static int branches_nr;
|
2007-09-11 07:02:56 +04:00
|
|
|
|
|
|
|
static struct branch *current_branch;
|
|
|
|
static const char *default_remote_name;
|
Give error when no remote is configured
When there's no explicitly-named remote, we use the remote specified
for the current branch, which in turn defaults to "origin". But it
this case should require the remote to actually be configured, and not
fall back to the path "origin".
Possibly, the config file's "remote = something" should require the
something to be a configured remote instead of a bare repository URL,
but we actually test with a bare repository URL.
In fetch, we were giving the sensible error message when coming up
with a URL failed, but this wasn't actually reachable, so move that
error up and use it when appropriate.
In push, we need a new error message, because the old one (formerly
unreachable without a lot of help) used the repo name, which was NULL.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-11 08:47:20 +03:00
|
|
|
static int explicit_default_remote_name;
|
2007-09-11 07:02:56 +04:00
|
|
|
|
2008-02-20 21:43:53 +03:00
|
|
|
static struct rewrite **rewrite;
|
|
|
|
static int rewrite_alloc;
|
|
|
|
static int rewrite_nr;
|
|
|
|
|
2007-05-12 19:45:53 +04:00
|
|
|
#define BUF_SIZE (2048)
|
|
|
|
static char buffer[BUF_SIZE];
|
|
|
|
|
2008-02-20 21:43:53 +03:00
|
|
|
static const char *alias_url(const char *url)
|
|
|
|
{
|
|
|
|
int i, j;
|
2008-02-25 09:25:04 +03:00
|
|
|
char *ret;
|
|
|
|
struct counted_string *longest;
|
|
|
|
int longest_i;
|
|
|
|
|
|
|
|
longest = NULL;
|
|
|
|
longest_i = -1;
|
2008-02-20 21:43:53 +03:00
|
|
|
for (i = 0; i < rewrite_nr; i++) {
|
|
|
|
if (!rewrite[i])
|
|
|
|
continue;
|
|
|
|
for (j = 0; j < rewrite[i]->instead_of_nr; j++) {
|
2008-02-25 09:25:04 +03:00
|
|
|
if (!prefixcmp(url, rewrite[i]->instead_of[j].s) &&
|
|
|
|
(!longest ||
|
|
|
|
longest->len < rewrite[i]->instead_of[j].len)) {
|
|
|
|
longest = &(rewrite[i]->instead_of[j]);
|
|
|
|
longest_i = i;
|
2008-02-20 21:43:53 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-02-25 09:25:04 +03:00
|
|
|
if (!longest)
|
|
|
|
return url;
|
|
|
|
|
2008-09-09 22:57:10 +04:00
|
|
|
ret = xmalloc(rewrite[longest_i]->baselen +
|
2008-02-25 09:25:04 +03:00
|
|
|
(strlen(url) - longest->len) + 1);
|
|
|
|
strcpy(ret, rewrite[longest_i]->base);
|
|
|
|
strcpy(ret + rewrite[longest_i]->baselen, url + longest->len);
|
|
|
|
return ret;
|
2008-02-20 21:43:53 +03:00
|
|
|
}
|
|
|
|
|
2007-05-12 19:45:53 +04:00
|
|
|
static void add_push_refspec(struct remote *remote, const char *ref)
|
|
|
|
{
|
2008-02-19 07:41:41 +03:00
|
|
|
ALLOC_GROW(remote->push_refspec,
|
|
|
|
remote->push_refspec_nr + 1,
|
|
|
|
remote->push_refspec_alloc);
|
|
|
|
remote->push_refspec[remote->push_refspec_nr++] = ref;
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
|
|
|
|
2007-05-12 19:46:03 +04:00
|
|
|
static void add_fetch_refspec(struct remote *remote, const char *ref)
|
|
|
|
{
|
2008-02-19 07:41:41 +03:00
|
|
|
ALLOC_GROW(remote->fetch_refspec,
|
|
|
|
remote->fetch_refspec_nr + 1,
|
|
|
|
remote->fetch_refspec_alloc);
|
|
|
|
remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
|
2007-05-12 19:46:03 +04:00
|
|
|
}
|
|
|
|
|
2007-09-19 08:49:27 +04:00
|
|
|
static void add_url(struct remote *remote, const char *url)
|
2007-05-12 19:45:53 +04:00
|
|
|
{
|
2008-02-19 07:41:41 +03:00
|
|
|
ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
|
|
|
|
remote->url[remote->url_nr++] = url;
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
|
|
|
|
2008-02-20 21:43:53 +03:00
|
|
|
static void add_url_alias(struct remote *remote, const char *url)
|
|
|
|
{
|
|
|
|
add_url(remote, alias_url(url));
|
|
|
|
}
|
|
|
|
|
2007-05-12 19:45:53 +04:00
|
|
|
static struct remote *make_remote(const char *name, int len)
|
|
|
|
{
|
2008-02-19 07:41:41 +03:00
|
|
|
struct remote *ret;
|
|
|
|
int i;
|
2007-05-12 19:45:53 +04:00
|
|
|
|
2008-02-19 07:41:41 +03:00
|
|
|
for (i = 0; i < remotes_nr; i++) {
|
|
|
|
if (len ? (!strncmp(name, remotes[i]->name, len) &&
|
|
|
|
!remotes[i]->name[len]) :
|
|
|
|
!strcmp(name, remotes[i]->name))
|
|
|
|
return remotes[i];
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
|
|
|
|
2008-02-19 07:41:41 +03:00
|
|
|
ret = xcalloc(1, sizeof(struct remote));
|
|
|
|
ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
|
|
|
|
remotes[remotes_nr++] = ret;
|
2007-05-12 19:45:53 +04:00
|
|
|
if (len)
|
2008-02-19 07:41:41 +03:00
|
|
|
ret->name = xstrndup(name, len);
|
2007-05-12 19:45:53 +04:00
|
|
|
else
|
2008-02-19 07:41:41 +03:00
|
|
|
ret->name = xstrdup(name);
|
|
|
|
return ret;
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
|
|
|
|
2007-09-11 07:02:56 +04:00
|
|
|
static void add_merge(struct branch *branch, const char *name)
|
|
|
|
{
|
2008-02-19 07:41:41 +03:00
|
|
|
ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
|
|
|
|
branch->merge_alloc);
|
|
|
|
branch->merge_name[branch->merge_nr++] = name;
|
2007-09-11 07:02:56 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct branch *make_branch(const char *name, int len)
|
|
|
|
{
|
2008-02-19 07:41:41 +03:00
|
|
|
struct branch *ret;
|
|
|
|
int i;
|
2007-09-11 07:02:56 +04:00
|
|
|
char *refname;
|
|
|
|
|
2008-02-19 07:41:41 +03:00
|
|
|
for (i = 0; i < branches_nr; i++) {
|
|
|
|
if (len ? (!strncmp(name, branches[i]->name, len) &&
|
|
|
|
!branches[i]->name[len]) :
|
|
|
|
!strcmp(name, branches[i]->name))
|
|
|
|
return branches[i];
|
2007-09-11 07:02:56 +04:00
|
|
|
}
|
|
|
|
|
2008-02-19 07:41:41 +03:00
|
|
|
ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
|
|
|
|
ret = xcalloc(1, sizeof(struct branch));
|
|
|
|
branches[branches_nr++] = ret;
|
2007-09-11 07:02:56 +04:00
|
|
|
if (len)
|
2008-02-19 07:41:41 +03:00
|
|
|
ret->name = xstrndup(name, len);
|
2007-09-11 07:02:56 +04:00
|
|
|
else
|
2008-02-19 07:41:41 +03:00
|
|
|
ret->name = xstrdup(name);
|
2008-09-09 22:57:10 +04:00
|
|
|
refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
|
2007-09-11 07:02:56 +04:00
|
|
|
strcpy(refname, "refs/heads/");
|
2008-02-19 07:41:41 +03:00
|
|
|
strcpy(refname + strlen("refs/heads/"), ret->name);
|
|
|
|
ret->refname = refname;
|
2007-09-11 07:02:56 +04:00
|
|
|
|
2008-02-19 07:41:41 +03:00
|
|
|
return ret;
|
2007-09-11 07:02:56 +04:00
|
|
|
}
|
|
|
|
|
2008-02-20 21:43:53 +03:00
|
|
|
static struct rewrite *make_rewrite(const char *base, int len)
|
|
|
|
{
|
|
|
|
struct rewrite *ret;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < rewrite_nr; i++) {
|
2008-02-25 09:25:04 +03:00
|
|
|
if (len
|
|
|
|
? (len == rewrite[i]->baselen &&
|
|
|
|
!strncmp(base, rewrite[i]->base, len))
|
|
|
|
: !strcmp(base, rewrite[i]->base))
|
2008-02-20 21:43:53 +03:00
|
|
|
return rewrite[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
ALLOC_GROW(rewrite, rewrite_nr + 1, rewrite_alloc);
|
|
|
|
ret = xcalloc(1, sizeof(struct rewrite));
|
|
|
|
rewrite[rewrite_nr++] = ret;
|
2008-02-25 09:25:04 +03:00
|
|
|
if (len) {
|
2008-02-20 21:43:53 +03:00
|
|
|
ret->base = xstrndup(base, len);
|
2008-02-25 09:25:04 +03:00
|
|
|
ret->baselen = len;
|
|
|
|
}
|
|
|
|
else {
|
2008-02-20 21:43:53 +03:00
|
|
|
ret->base = xstrdup(base);
|
2008-02-25 09:25:04 +03:00
|
|
|
ret->baselen = strlen(base);
|
|
|
|
}
|
2008-02-20 21:43:53 +03:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
|
|
|
|
{
|
|
|
|
ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
|
2008-02-25 09:25:04 +03:00
|
|
|
rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
|
|
|
|
rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
|
|
|
|
rewrite->instead_of_nr++;
|
2008-02-20 21:43:53 +03:00
|
|
|
}
|
|
|
|
|
2007-05-12 19:45:53 +04:00
|
|
|
static void read_remotes_file(struct remote *remote)
|
|
|
|
{
|
|
|
|
FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
|
|
|
|
|
|
|
|
if (!f)
|
|
|
|
return;
|
2008-11-10 23:43:00 +03:00
|
|
|
remote->origin = REMOTE_REMOTES;
|
2007-05-12 19:45:53 +04:00
|
|
|
while (fgets(buffer, BUF_SIZE, f)) {
|
|
|
|
int value_list;
|
|
|
|
char *s, *p;
|
|
|
|
|
|
|
|
if (!prefixcmp(buffer, "URL:")) {
|
|
|
|
value_list = 0;
|
|
|
|
s = buffer + 4;
|
|
|
|
} else if (!prefixcmp(buffer, "Push:")) {
|
|
|
|
value_list = 1;
|
|
|
|
s = buffer + 5;
|
2007-05-12 19:46:03 +04:00
|
|
|
} else if (!prefixcmp(buffer, "Pull:")) {
|
|
|
|
value_list = 2;
|
|
|
|
s = buffer + 5;
|
2007-05-12 19:45:53 +04:00
|
|
|
} else
|
|
|
|
continue;
|
|
|
|
|
|
|
|
while (isspace(*s))
|
|
|
|
s++;
|
|
|
|
if (!*s)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
p = s + strlen(s);
|
|
|
|
while (isspace(p[-1]))
|
|
|
|
*--p = 0;
|
|
|
|
|
|
|
|
switch (value_list) {
|
|
|
|
case 0:
|
2008-02-20 21:43:53 +03:00
|
|
|
add_url_alias(remote, xstrdup(s));
|
2007-05-12 19:45:53 +04:00
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
add_push_refspec(remote, xstrdup(s));
|
|
|
|
break;
|
2007-05-12 19:46:03 +04:00
|
|
|
case 2:
|
|
|
|
add_fetch_refspec(remote, xstrdup(s));
|
|
|
|
break;
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_branches_file(struct remote *remote)
|
|
|
|
{
|
|
|
|
const char *slash = strchr(remote->name, '/');
|
2007-09-11 07:02:56 +04:00
|
|
|
char *frag;
|
2008-10-09 23:12:12 +04:00
|
|
|
struct strbuf branch = STRBUF_INIT;
|
2007-05-12 19:45:53 +04:00
|
|
|
int n = slash ? slash - remote->name : 1000;
|
|
|
|
FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
|
|
|
|
char *s, *p;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (!f)
|
|
|
|
return;
|
|
|
|
s = fgets(buffer, BUF_SIZE, f);
|
|
|
|
fclose(f);
|
|
|
|
if (!s)
|
|
|
|
return;
|
|
|
|
while (isspace(*s))
|
|
|
|
s++;
|
|
|
|
if (!*s)
|
|
|
|
return;
|
2008-11-10 23:43:00 +03:00
|
|
|
remote->origin = REMOTE_BRANCHES;
|
2007-05-12 19:45:53 +04:00
|
|
|
p = s + strlen(s);
|
|
|
|
while (isspace(p[-1]))
|
|
|
|
*--p = 0;
|
|
|
|
len = p - s;
|
|
|
|
if (slash)
|
|
|
|
len += strlen(slash);
|
|
|
|
p = xmalloc(len + 1);
|
|
|
|
strcpy(p, s);
|
|
|
|
if (slash)
|
|
|
|
strcat(p, slash);
|
2008-03-26 02:35:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
|
|
|
|
* reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
|
|
|
|
* the partial URL obtained from the branches file plus
|
|
|
|
* "/netdev-2.6" and does not store it in any tracking ref.
|
|
|
|
* #branch specifier in the file is ignored.
|
|
|
|
*
|
|
|
|
* Otherwise, the branches file would have URL and optionally
|
|
|
|
* #branch specified. The "master" (or specified) branch is
|
|
|
|
* fetched and stored in the local branch of the same name.
|
|
|
|
*/
|
2007-09-11 07:02:56 +04:00
|
|
|
frag = strchr(p, '#');
|
|
|
|
if (frag) {
|
|
|
|
*(frag++) = '\0';
|
2008-03-26 02:35:28 +03:00
|
|
|
strbuf_addf(&branch, "refs/heads/%s", frag);
|
|
|
|
} else
|
|
|
|
strbuf_addstr(&branch, "refs/heads/master");
|
|
|
|
if (!slash) {
|
|
|
|
strbuf_addf(&branch, ":refs/heads/%s", remote->name);
|
2007-09-11 07:02:56 +04:00
|
|
|
} else {
|
2008-03-26 02:35:28 +03:00
|
|
|
strbuf_reset(&branch);
|
|
|
|
strbuf_addstr(&branch, "HEAD:");
|
2007-09-11 07:02:56 +04:00
|
|
|
}
|
2008-02-20 21:43:53 +03:00
|
|
|
add_url_alias(remote, p);
|
2008-03-26 02:35:28 +03:00
|
|
|
add_fetch_refspec(remote, strbuf_detach(&branch, 0));
|
2008-11-11 00:47:11 +03:00
|
|
|
/*
|
|
|
|
* 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));
|
2007-09-11 07:03:08 +04:00
|
|
|
remote->fetch_tags = 1; /* always auto-follow */
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
|
|
|
|
2008-05-14 21:46:53 +04:00
|
|
|
static int handle_config(const char *key, const char *value, void *cb)
|
2007-05-12 19:45:53 +04:00
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
const char *subkey;
|
|
|
|
struct remote *remote;
|
2007-09-11 07:02:56 +04:00
|
|
|
struct branch *branch;
|
|
|
|
if (!prefixcmp(key, "branch.")) {
|
|
|
|
name = key + 7;
|
|
|
|
subkey = strrchr(name, '.');
|
|
|
|
if (!subkey)
|
|
|
|
return 0;
|
2007-12-15 07:34:56 +03:00
|
|
|
branch = make_branch(name, subkey - name);
|
2007-09-11 07:02:56 +04:00
|
|
|
if (!strcmp(subkey, ".remote")) {
|
2008-02-11 22:00:10 +03:00
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(key);
|
2007-09-11 07:02:56 +04:00
|
|
|
branch->remote_name = xstrdup(value);
|
Give error when no remote is configured
When there's no explicitly-named remote, we use the remote specified
for the current branch, which in turn defaults to "origin". But it
this case should require the remote to actually be configured, and not
fall back to the path "origin".
Possibly, the config file's "remote = something" should require the
something to be a configured remote instead of a bare repository URL,
but we actually test with a bare repository URL.
In fetch, we were giving the sensible error message when coming up
with a URL failed, but this wasn't actually reachable, so move that
error up and use it when appropriate.
In push, we need a new error message, because the old one (formerly
unreachable without a lot of help) used the repo name, which was NULL.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-11 08:47:20 +03:00
|
|
|
if (branch == current_branch) {
|
2007-09-11 07:02:56 +04:00
|
|
|
default_remote_name = branch->remote_name;
|
Give error when no remote is configured
When there's no explicitly-named remote, we use the remote specified
for the current branch, which in turn defaults to "origin". But it
this case should require the remote to actually be configured, and not
fall back to the path "origin".
Possibly, the config file's "remote = something" should require the
something to be a configured remote instead of a bare repository URL,
but we actually test with a bare repository URL.
In fetch, we were giving the sensible error message when coming up
with a URL failed, but this wasn't actually reachable, so move that
error up and use it when appropriate.
In push, we need a new error message, because the old one (formerly
unreachable without a lot of help) used the repo name, which was NULL.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-11 08:47:20 +03:00
|
|
|
explicit_default_remote_name = 1;
|
|
|
|
}
|
2008-02-11 22:00:10 +03:00
|
|
|
} else if (!strcmp(subkey, ".merge")) {
|
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(key);
|
2007-09-11 07:02:56 +04:00
|
|
|
add_merge(branch, xstrdup(value));
|
2008-02-11 22:00:10 +03:00
|
|
|
}
|
2007-09-11 07:02:56 +04:00
|
|
|
return 0;
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
2008-02-20 21:43:53 +03:00
|
|
|
if (!prefixcmp(key, "url.")) {
|
|
|
|
struct rewrite *rewrite;
|
2008-04-12 23:32:00 +04:00
|
|
|
name = key + 4;
|
2008-02-20 21:43:53 +03:00
|
|
|
subkey = strrchr(name, '.');
|
|
|
|
if (!subkey)
|
|
|
|
return 0;
|
|
|
|
rewrite = make_rewrite(name, subkey - name);
|
|
|
|
if (!strcmp(subkey, ".insteadof")) {
|
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(key);
|
|
|
|
add_instead_of(rewrite, xstrdup(value));
|
|
|
|
}
|
|
|
|
}
|
2007-05-12 19:45:53 +04:00
|
|
|
if (prefixcmp(key, "remote."))
|
|
|
|
return 0;
|
|
|
|
name = key + 7;
|
2008-10-15 00:30:21 +04:00
|
|
|
if (*name == '/') {
|
|
|
|
warning("Config remote shorthand cannot begin with '/': %s",
|
|
|
|
name);
|
|
|
|
return 0;
|
|
|
|
}
|
2007-05-12 19:45:53 +04:00
|
|
|
subkey = strrchr(name, '.');
|
|
|
|
if (!subkey)
|
2009-04-23 17:49:05 +04:00
|
|
|
return 0;
|
2007-05-12 19:45:53 +04:00
|
|
|
remote = make_remote(name, subkey - name);
|
2008-11-10 23:43:00 +03:00
|
|
|
remote->origin = REMOTE_CONFIG;
|
2008-04-17 15:17:20 +04:00
|
|
|
if (!strcmp(subkey, ".mirror"))
|
|
|
|
remote->mirror = git_config_bool(key, value);
|
|
|
|
else if (!strcmp(subkey, ".skipdefaultupdate"))
|
|
|
|
remote->skip_default_update = git_config_bool(key, value);
|
|
|
|
|
|
|
|
else if (!strcmp(subkey, ".url")) {
|
|
|
|
const char *v;
|
|
|
|
if (git_config_string(&v, key, value))
|
|
|
|
return -1;
|
|
|
|
add_url(remote, v);
|
2007-05-12 19:45:53 +04:00
|
|
|
} else if (!strcmp(subkey, ".push")) {
|
2008-04-17 15:17:20 +04:00
|
|
|
const char *v;
|
|
|
|
if (git_config_string(&v, key, value))
|
|
|
|
return -1;
|
|
|
|
add_push_refspec(remote, v);
|
2007-05-12 19:46:03 +04:00
|
|
|
} else if (!strcmp(subkey, ".fetch")) {
|
2008-04-17 15:17:20 +04:00
|
|
|
const char *v;
|
|
|
|
if (git_config_string(&v, key, value))
|
|
|
|
return -1;
|
|
|
|
add_fetch_refspec(remote, v);
|
2007-05-12 19:45:53 +04:00
|
|
|
} else if (!strcmp(subkey, ".receivepack")) {
|
2008-04-17 15:17:20 +04:00
|
|
|
const char *v;
|
|
|
|
if (git_config_string(&v, key, value))
|
|
|
|
return -1;
|
2007-05-12 19:45:53 +04:00
|
|
|
if (!remote->receivepack)
|
2008-04-17 15:17:20 +04:00
|
|
|
remote->receivepack = v;
|
2007-05-12 19:45:53 +04:00
|
|
|
else
|
|
|
|
error("more than one receivepack given, using the first");
|
2007-09-11 07:02:51 +04:00
|
|
|
} else if (!strcmp(subkey, ".uploadpack")) {
|
2008-04-17 15:17:20 +04:00
|
|
|
const char *v;
|
|
|
|
if (git_config_string(&v, key, value))
|
|
|
|
return -1;
|
2007-09-11 07:02:51 +04:00
|
|
|
if (!remote->uploadpack)
|
2008-04-17 15:17:20 +04:00
|
|
|
remote->uploadpack = v;
|
2007-09-11 07:02:51 +04:00
|
|
|
else
|
|
|
|
error("more than one uploadpack given, using the first");
|
2007-09-11 07:03:08 +04:00
|
|
|
} else if (!strcmp(subkey, ".tagopt")) {
|
|
|
|
if (!strcmp(value, "--no-tags"))
|
|
|
|
remote->fetch_tags = -1;
|
2007-12-04 00:48:54 +03:00
|
|
|
} else if (!strcmp(subkey, ".proxy")) {
|
2008-04-17 15:17:20 +04:00
|
|
|
return git_config_string((const char **)&remote->http_proxy,
|
|
|
|
key, value);
|
|
|
|
}
|
2007-05-12 19:45:53 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-20 21:43:53 +03:00
|
|
|
static void alias_all_urls(void)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
for (i = 0; i < remotes_nr; i++) {
|
|
|
|
if (!remotes[i])
|
|
|
|
continue;
|
|
|
|
for (j = 0; j < remotes[i]->url_nr; j++) {
|
|
|
|
remotes[i]->url[j] = alias_url(remotes[i]->url[j]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-05-12 19:45:53 +04:00
|
|
|
static void read_config(void)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
const char *head_ref;
|
|
|
|
int flag;
|
|
|
|
if (default_remote_name) // did this already
|
|
|
|
return;
|
|
|
|
default_remote_name = xstrdup("origin");
|
|
|
|
current_branch = NULL;
|
|
|
|
head_ref = resolve_ref("HEAD", sha1, 0, &flag);
|
|
|
|
if (head_ref && (flag & REF_ISSYMREF) &&
|
|
|
|
!prefixcmp(head_ref, "refs/heads/")) {
|
2007-09-11 07:02:56 +04:00
|
|
|
current_branch =
|
|
|
|
make_branch(head_ref + strlen("refs/heads/"), 0);
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
2008-05-14 21:46:53 +04:00
|
|
|
git_config(handle_config, NULL);
|
2008-02-20 21:43:53 +03:00
|
|
|
alias_all_urls();
|
2007-05-12 19:45:53 +04:00
|
|
|
}
|
|
|
|
|
2008-07-27 10:15:51 +04:00
|
|
|
/*
|
|
|
|
* We need to make sure the tracking branches are well formed, but a
|
|
|
|
* wildcard refspec in "struct refspec" must have a trailing slash. We
|
|
|
|
* temporarily drop the trailing '/' while calling check_ref_format(),
|
|
|
|
* and put it back. The caller knows that a CHECK_REF_FORMAT_ONELEVEL
|
|
|
|
* error return is Ok for a wildcard refspec.
|
|
|
|
*/
|
|
|
|
static int verify_refname(char *name, int is_glob)
|
|
|
|
{
|
2009-03-07 09:11:36 +03:00
|
|
|
int result;
|
2008-07-27 10:15:51 +04:00
|
|
|
|
|
|
|
result = check_ref_format(name);
|
2009-03-07 09:11:36 +03:00
|
|
|
if (is_glob && result == CHECK_REF_FORMAT_WILDCARD)
|
|
|
|
result = CHECK_REF_FORMAT_OK;
|
2008-07-27 10:15:51 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-08-22 04:16:30 +04:00
|
|
|
/*
|
|
|
|
* This function frees a refspec array.
|
|
|
|
* Warning: code paths should be checked to ensure that the src
|
|
|
|
* and dst pointers are always freeable pointers as well
|
|
|
|
* as the refspec pointer itself.
|
|
|
|
*/
|
2008-09-25 13:41:00 +04:00
|
|
|
static void free_refspecs(struct refspec *refspec, int nr_refspec)
|
2008-08-22 04:16:30 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!refspec)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < nr_refspec; i++) {
|
|
|
|
free(refspec[i].src);
|
|
|
|
free(refspec[i].dst);
|
|
|
|
}
|
|
|
|
free(refspec);
|
|
|
|
}
|
|
|
|
|
2008-04-13 13:56:54 +04:00
|
|
|
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
|
2007-05-12 19:45:59 +04:00
|
|
|
{
|
|
|
|
int i;
|
2008-03-18 05:05:23 +03:00
|
|
|
int st;
|
2007-05-12 19:45:59 +04:00
|
|
|
struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
|
2007-05-12 19:45:59 +04:00
|
|
|
for (i = 0; i < nr_refspec; i++) {
|
2008-07-27 10:15:51 +04:00
|
|
|
size_t llen;
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
int is_glob;
|
|
|
|
const char *lhs, *rhs;
|
|
|
|
|
2009-03-13 15:51:33 +03:00
|
|
|
is_glob = 0;
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
|
|
|
|
lhs = refspec[i];
|
|
|
|
if (*lhs == '+') {
|
2007-05-12 19:45:59 +04:00
|
|
|
rs[i].force = 1;
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
lhs++;
|
2007-05-12 19:45:59 +04:00
|
|
|
}
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
|
|
|
|
rhs = strrchr(lhs, ':');
|
2008-04-28 19:32:12 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Before going on, special case ":" (or "+:") as a refspec
|
|
|
|
* for matching refs.
|
|
|
|
*/
|
|
|
|
if (!fetch && rhs == lhs && rhs[1] == '\0') {
|
|
|
|
rs[i].matching = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
if (rhs) {
|
2008-07-27 10:15:51 +04:00
|
|
|
size_t rlen = strlen(++rhs);
|
2009-03-07 09:11:39 +03:00
|
|
|
is_glob = (1 <= rlen && strchr(rhs, '*'));
|
2009-03-07 09:11:36 +03:00
|
|
|
rs[i].dst = xstrndup(rhs, rlen);
|
2007-05-12 19:45:59 +04:00
|
|
|
}
|
2008-03-18 05:05:23 +03:00
|
|
|
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
|
2009-03-07 09:11:39 +03:00
|
|
|
if (1 <= llen && memchr(lhs, '*', llen)) {
|
2008-03-26 07:15:52 +03:00
|
|
|
if ((rhs && !is_glob) || (!rhs && fetch))
|
|
|
|
goto invalid;
|
|
|
|
is_glob = 1;
|
|
|
|
} else if (rhs && is_glob) {
|
|
|
|
goto invalid;
|
2008-03-18 05:05:23 +03:00
|
|
|
}
|
2008-03-26 07:15:52 +03:00
|
|
|
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
rs[i].pattern = is_glob;
|
|
|
|
rs[i].src = xstrndup(lhs, llen);
|
|
|
|
|
|
|
|
if (fetch) {
|
|
|
|
/*
|
|
|
|
* LHS
|
|
|
|
* - empty is allowed; it means HEAD.
|
|
|
|
* - otherwise it must be a valid looking ref.
|
|
|
|
*/
|
|
|
|
if (!*rs[i].src)
|
|
|
|
; /* empty is ok */
|
|
|
|
else {
|
2008-07-27 10:15:51 +04:00
|
|
|
st = verify_refname(rs[i].src, is_glob);
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
if (st && st != CHECK_REF_FORMAT_ONELEVEL)
|
|
|
|
goto invalid;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* RHS
|
2008-03-26 07:15:52 +03:00
|
|
|
* - missing is ok, and is same as empty.
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
* - empty is ok; it means not to store.
|
|
|
|
* - otherwise it must be a valid looking ref.
|
|
|
|
*/
|
|
|
|
if (!rs[i].dst) {
|
|
|
|
; /* ok */
|
|
|
|
} else if (!*rs[i].dst) {
|
|
|
|
; /* ok */
|
|
|
|
} else {
|
2008-07-27 10:15:51 +04:00
|
|
|
st = verify_refname(rs[i].dst, is_glob);
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
if (st && st != CHECK_REF_FORMAT_ONELEVEL)
|
|
|
|
goto invalid;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* LHS
|
|
|
|
* - empty is allowed; it means delete.
|
|
|
|
* - when wildcarded, it must be a valid looking ref.
|
|
|
|
* - otherwise, it must be an extended SHA-1, but
|
|
|
|
* there is no existing way to validate this.
|
|
|
|
*/
|
|
|
|
if (!*rs[i].src)
|
|
|
|
; /* empty is ok */
|
|
|
|
else if (is_glob) {
|
2008-07-27 10:15:51 +04:00
|
|
|
st = verify_refname(rs[i].src, is_glob);
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
if (st && st != CHECK_REF_FORMAT_ONELEVEL)
|
|
|
|
goto invalid;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
; /* anything goes, for now */
|
|
|
|
/*
|
|
|
|
* RHS
|
|
|
|
* - missing is allowed, but LHS then must be a
|
|
|
|
* valid looking ref.
|
|
|
|
* - empty is not allowed.
|
|
|
|
* - otherwise it must be a valid looking ref.
|
|
|
|
*/
|
|
|
|
if (!rs[i].dst) {
|
2008-07-27 10:15:51 +04:00
|
|
|
st = verify_refname(rs[i].src, is_glob);
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
if (st && st != CHECK_REF_FORMAT_ONELEVEL)
|
|
|
|
goto invalid;
|
|
|
|
} else if (!*rs[i].dst) {
|
|
|
|
goto invalid;
|
|
|
|
} else {
|
2008-07-27 10:15:51 +04:00
|
|
|
st = verify_refname(rs[i].dst, is_glob);
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
if (st && st != CHECK_REF_FORMAT_ONELEVEL)
|
|
|
|
goto invalid;
|
|
|
|
}
|
2008-03-18 05:05:23 +03:00
|
|
|
}
|
2007-05-12 19:45:59 +04:00
|
|
|
}
|
|
|
|
return rs;
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
|
|
|
|
invalid:
|
2008-04-13 13:56:54 +04:00
|
|
|
if (verify) {
|
2008-08-22 04:16:30 +04:00
|
|
|
/*
|
|
|
|
* nr_refspec must be greater than zero and i must be valid
|
|
|
|
* since it is only possible to reach this point from within
|
|
|
|
* the for loop above.
|
|
|
|
*/
|
|
|
|
free_refspecs(rs, i+1);
|
2008-04-13 13:56:54 +04:00
|
|
|
return NULL;
|
|
|
|
}
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
die("Invalid refspec '%s'", refspec[i]);
|
|
|
|
}
|
|
|
|
|
2008-04-13 13:56:54 +04:00
|
|
|
int valid_fetch_refspec(const char *fetch_refspec_str)
|
|
|
|
{
|
|
|
|
const char *fetch_refspec[] = { fetch_refspec_str };
|
|
|
|
struct refspec *refspec;
|
|
|
|
|
|
|
|
refspec = parse_refspec_internal(1, fetch_refspec, 1, 1);
|
2008-08-22 04:16:30 +04:00
|
|
|
free_refspecs(refspec, 1);
|
2008-04-13 13:56:54 +04:00
|
|
|
return !!refspec;
|
|
|
|
}
|
|
|
|
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
|
|
|
|
{
|
2008-04-13 13:56:54 +04:00
|
|
|
return parse_refspec_internal(nr_refspec, refspec, 1, 0);
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
}
|
|
|
|
|
2008-09-25 13:41:00 +04:00
|
|
|
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
{
|
2008-04-13 13:56:54 +04:00
|
|
|
return parse_refspec_internal(nr_refspec, refspec, 0, 0);
|
2007-05-12 19:45:59 +04:00
|
|
|
}
|
|
|
|
|
2008-02-15 22:14:18 +03:00
|
|
|
static int valid_remote_nick(const char *name)
|
|
|
|
{
|
2009-01-10 15:07:50 +03:00
|
|
|
if (!name[0] || is_dot_or_dotdot(name))
|
2008-02-15 22:14:18 +03:00
|
|
|
return 0;
|
|
|
|
return !strchr(name, '/'); /* no slash */
|
|
|
|
}
|
|
|
|
|
2007-05-12 19:45:53 +04:00
|
|
|
struct remote *remote_get(const char *name)
|
|
|
|
{
|
|
|
|
struct remote *ret;
|
Give error when no remote is configured
When there's no explicitly-named remote, we use the remote specified
for the current branch, which in turn defaults to "origin". But it
this case should require the remote to actually be configured, and not
fall back to the path "origin".
Possibly, the config file's "remote = something" should require the
something to be a configured remote instead of a bare repository URL,
but we actually test with a bare repository URL.
In fetch, we were giving the sensible error message when coming up
with a URL failed, but this wasn't actually reachable, so move that
error up and use it when appropriate.
In push, we need a new error message, because the old one (formerly
unreachable without a lot of help) used the repo name, which was NULL.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-11 08:47:20 +03:00
|
|
|
int name_given = 0;
|
2007-05-12 19:45:53 +04:00
|
|
|
|
|
|
|
read_config();
|
Give error when no remote is configured
When there's no explicitly-named remote, we use the remote specified
for the current branch, which in turn defaults to "origin". But it
this case should require the remote to actually be configured, and not
fall back to the path "origin".
Possibly, the config file's "remote = something" should require the
something to be a configured remote instead of a bare repository URL,
but we actually test with a bare repository URL.
In fetch, we were giving the sensible error message when coming up
with a URL failed, but this wasn't actually reachable, so move that
error up and use it when appropriate.
In push, we need a new error message, because the old one (formerly
unreachable without a lot of help) used the repo name, which was NULL.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-11 08:47:20 +03:00
|
|
|
if (name)
|
|
|
|
name_given = 1;
|
|
|
|
else {
|
2007-05-12 19:45:53 +04:00
|
|
|
name = default_remote_name;
|
Give error when no remote is configured
When there's no explicitly-named remote, we use the remote specified
for the current branch, which in turn defaults to "origin". But it
this case should require the remote to actually be configured, and not
fall back to the path "origin".
Possibly, the config file's "remote = something" should require the
something to be a configured remote instead of a bare repository URL,
but we actually test with a bare repository URL.
In fetch, we were giving the sensible error message when coming up
with a URL failed, but this wasn't actually reachable, so move that
error up and use it when appropriate.
In push, we need a new error message, because the old one (formerly
unreachable without a lot of help) used the repo name, which was NULL.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-11 08:47:20 +03:00
|
|
|
name_given = explicit_default_remote_name;
|
|
|
|
}
|
2009-03-16 10:35:09 +03:00
|
|
|
|
2007-05-12 19:45:53 +04:00
|
|
|
ret = make_remote(name, 0);
|
2008-02-15 22:14:18 +03:00
|
|
|
if (valid_remote_nick(name)) {
|
2007-09-19 08:49:27 +04:00
|
|
|
if (!ret->url)
|
2007-05-12 19:45:53 +04:00
|
|
|
read_remotes_file(ret);
|
2007-09-19 08:49:27 +04:00
|
|
|
if (!ret->url)
|
2007-05-12 19:45:53 +04:00
|
|
|
read_branches_file(ret);
|
|
|
|
}
|
2009-03-16 10:35:09 +03:00
|
|
|
if (name_given && !ret->url)
|
2008-02-20 21:43:53 +03:00
|
|
|
add_url_alias(ret, name);
|
2007-09-19 08:49:27 +04:00
|
|
|
if (!ret->url)
|
2007-05-12 19:45:53 +04:00
|
|
|
return NULL;
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
|
|
|
|
ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
|
2007-05-12 19:45:53 +04:00
|
|
|
return ret;
|
|
|
|
}
|
2007-05-12 19:45:59 +04:00
|
|
|
|
2009-04-06 17:41:01 +04:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2007-07-10 21:48:40 +04:00
|
|
|
int for_each_remote(each_remote_fn fn, void *priv)
|
|
|
|
{
|
|
|
|
int i, result = 0;
|
|
|
|
read_config();
|
2008-02-19 07:41:41 +03:00
|
|
|
for (i = 0; i < remotes_nr && !result; i++) {
|
2007-07-10 21:48:40 +04:00
|
|
|
struct remote *r = remotes[i];
|
|
|
|
if (!r)
|
|
|
|
continue;
|
|
|
|
if (!r->fetch)
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
|
|
|
|
r->fetch_refspec);
|
2007-07-10 21:48:40 +04:00
|
|
|
if (!r->push)
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
r->push = parse_push_refspec(r->push_refspec_nr,
|
|
|
|
r->push_refspec);
|
2007-07-10 21:48:40 +04:00
|
|
|
result = fn(r, priv);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-10-08 08:25:07 +04:00
|
|
|
void ref_remove_duplicates(struct ref *ref_map)
|
|
|
|
{
|
|
|
|
struct ref **posn;
|
|
|
|
struct ref *next;
|
|
|
|
for (; ref_map; ref_map = ref_map->next) {
|
|
|
|
if (!ref_map->peer_ref)
|
|
|
|
continue;
|
|
|
|
posn = &ref_map->next;
|
|
|
|
while (*posn) {
|
|
|
|
if ((*posn)->peer_ref &&
|
|
|
|
!strcmp((*posn)->peer_ref->name,
|
|
|
|
ref_map->peer_ref->name)) {
|
|
|
|
if (strcmp((*posn)->name, ref_map->name))
|
|
|
|
die("%s tracks both %s and %s",
|
|
|
|
ref_map->peer_ref->name,
|
|
|
|
(*posn)->name, ref_map->name);
|
|
|
|
next = (*posn)->next;
|
|
|
|
free((*posn)->peer_ref);
|
|
|
|
free(*posn);
|
|
|
|
*posn = next;
|
|
|
|
} else {
|
|
|
|
posn = &(*posn)->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-19 08:49:27 +04:00
|
|
|
int remote_has_url(struct remote *remote, const char *url)
|
2007-05-12 19:46:03 +04:00
|
|
|
{
|
|
|
|
int i;
|
2007-09-19 08:49:27 +04:00
|
|
|
for (i = 0; i < remote->url_nr; i++) {
|
|
|
|
if (!strcmp(remote->url[i], url))
|
2007-05-12 19:46:03 +04:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-03-07 09:11:34 +03:00
|
|
|
static int match_name_with_pattern(const char *key, const char *name,
|
|
|
|
const char *value, char **result)
|
2009-03-07 09:11:29 +03:00
|
|
|
{
|
2009-03-07 09:11:36 +03:00
|
|
|
const char *kstar = strchr(key, '*');
|
|
|
|
size_t klen;
|
2009-03-07 09:11:39 +03:00
|
|
|
size_t ksuffixlen;
|
|
|
|
size_t namelen;
|
2009-03-07 09:11:36 +03:00
|
|
|
int ret;
|
|
|
|
if (!kstar)
|
|
|
|
die("Key '%s' of pattern had no '*'", key);
|
|
|
|
klen = kstar - key;
|
2009-03-07 09:11:39 +03:00
|
|
|
ksuffixlen = strlen(kstar + 1);
|
|
|
|
namelen = strlen(name);
|
|
|
|
ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
|
|
|
|
!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
|
2009-03-07 09:11:34 +03:00
|
|
|
if (ret && value) {
|
2009-03-07 09:11:36 +03:00
|
|
|
const char *vstar = strchr(value, '*');
|
|
|
|
size_t vlen;
|
2009-03-07 09:11:39 +03:00
|
|
|
size_t vsuffixlen;
|
2009-03-07 09:11:36 +03:00
|
|
|
if (!vstar)
|
|
|
|
die("Value '%s' of pattern has no '*'", value);
|
|
|
|
vlen = vstar - value;
|
2009-03-07 09:11:39 +03:00
|
|
|
vsuffixlen = strlen(vstar + 1);
|
|
|
|
*result = xmalloc(vlen + vsuffixlen +
|
2009-03-07 09:11:34 +03:00
|
|
|
strlen(name) -
|
2009-03-07 09:11:39 +03:00
|
|
|
klen - ksuffixlen + 1);
|
|
|
|
strncpy(*result, value, vlen);
|
|
|
|
strncpy(*result + vlen,
|
|
|
|
name + klen, namelen - klen - ksuffixlen);
|
|
|
|
strcpy(*result + vlen + namelen - klen - ksuffixlen,
|
|
|
|
vstar + 1);
|
2009-03-07 09:11:34 +03:00
|
|
|
}
|
2009-03-07 09:11:29 +03:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-05-12 19:46:03 +04:00
|
|
|
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
|
|
|
|
{
|
2007-07-10 21:48:40 +04:00
|
|
|
int find_src = refspec->src == NULL;
|
|
|
|
char *needle, **result;
|
2007-05-12 19:46:03 +04:00
|
|
|
int i;
|
2007-07-10 21:48:40 +04:00
|
|
|
|
|
|
|
if (find_src) {
|
2007-09-25 08:13:14 +04:00
|
|
|
if (!refspec->dst)
|
2007-07-10 21:48:40 +04:00
|
|
|
return error("find_tracking: need either src or dst");
|
|
|
|
needle = refspec->dst;
|
|
|
|
result = &refspec->src;
|
|
|
|
} else {
|
|
|
|
needle = refspec->src;
|
|
|
|
result = &refspec->dst;
|
|
|
|
}
|
|
|
|
|
2007-05-12 19:46:03 +04:00
|
|
|
for (i = 0; i < remote->fetch_refspec_nr; i++) {
|
|
|
|
struct refspec *fetch = &remote->fetch[i];
|
2007-07-10 21:48:40 +04:00
|
|
|
const char *key = find_src ? fetch->dst : fetch->src;
|
|
|
|
const char *value = find_src ? fetch->src : fetch->dst;
|
2007-05-12 19:46:03 +04:00
|
|
|
if (!fetch->dst)
|
|
|
|
continue;
|
|
|
|
if (fetch->pattern) {
|
2009-03-07 09:11:34 +03:00
|
|
|
if (match_name_with_pattern(key, needle, value, result)) {
|
2007-05-12 19:46:03 +04:00
|
|
|
refspec->force = fetch->force;
|
|
|
|
return 0;
|
|
|
|
}
|
2007-07-10 21:48:40 +04:00
|
|
|
} else if (!strcmp(needle, key)) {
|
|
|
|
*result = xstrdup(value);
|
|
|
|
refspec->force = fetch->force;
|
|
|
|
return 0;
|
2007-05-12 19:46:03 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-10-18 12:37:40 +04:00
|
|
|
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
size_t len = strlen(name);
|
|
|
|
struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
|
|
|
|
memcpy(ref->name, prefix, prefixlen);
|
|
|
|
memcpy(ref->name + prefixlen, name, len);
|
|
|
|
return ref;
|
|
|
|
}
|
|
|
|
|
2008-10-18 12:44:18 +04:00
|
|
|
struct ref *alloc_ref(const char *name)
|
2007-07-10 08:47:23 +04:00
|
|
|
{
|
2008-10-18 12:44:18 +04:00
|
|
|
return alloc_ref_with_prefix("", 0, name);
|
2008-05-11 03:26:58 +04:00
|
|
|
}
|
|
|
|
|
2007-10-30 04:05:40 +03:00
|
|
|
static struct ref *copy_ref(const struct ref *ref)
|
2007-09-11 07:03:08 +04:00
|
|
|
{
|
2009-02-27 22:10:04 +03:00
|
|
|
struct ref *cpy;
|
|
|
|
size_t len;
|
|
|
|
if (!ref)
|
|
|
|
return NULL;
|
|
|
|
len = strlen(ref->name);
|
|
|
|
cpy = xmalloc(sizeof(struct ref) + len + 1);
|
|
|
|
memcpy(cpy, ref, sizeof(struct ref) + len + 1);
|
|
|
|
cpy->next = NULL;
|
|
|
|
cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
|
|
|
|
cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
|
|
|
|
cpy->peer_ref = copy_ref(ref->peer_ref);
|
|
|
|
return cpy;
|
2007-09-11 07:03:08 +04:00
|
|
|
}
|
|
|
|
|
2007-10-30 04:05:40 +03:00
|
|
|
struct ref *copy_ref_list(const struct ref *ref)
|
|
|
|
{
|
|
|
|
struct ref *ret = NULL;
|
|
|
|
struct ref **tail = &ret;
|
|
|
|
while (ref) {
|
|
|
|
*tail = copy_ref(ref);
|
|
|
|
ref = ref->next;
|
|
|
|
tail = &((*tail)->next);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-09-25 13:41:00 +04:00
|
|
|
static void free_ref(struct ref *ref)
|
2008-04-26 23:53:12 +04:00
|
|
|
{
|
|
|
|
if (!ref)
|
|
|
|
return;
|
2009-02-27 22:10:04 +03:00
|
|
|
free_ref(ref->peer_ref);
|
2008-04-26 23:53:12 +04:00
|
|
|
free(ref->remote_status);
|
|
|
|
free(ref->symref);
|
|
|
|
free(ref);
|
|
|
|
}
|
|
|
|
|
2007-07-10 08:47:23 +04:00
|
|
|
void free_refs(struct ref *ref)
|
|
|
|
{
|
|
|
|
struct ref *next;
|
|
|
|
while (ref) {
|
|
|
|
next = ref->next;
|
2008-04-26 23:53:12 +04:00
|
|
|
free_ref(ref);
|
2007-07-10 08:47:23 +04:00
|
|
|
ref = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-05-12 19:45:59 +04:00
|
|
|
static int count_refspec_match(const char *pattern,
|
|
|
|
struct ref *refs,
|
|
|
|
struct ref **matched_ref)
|
|
|
|
{
|
|
|
|
int patlen = strlen(pattern);
|
|
|
|
struct ref *matched_weak = NULL;
|
|
|
|
struct ref *matched = NULL;
|
|
|
|
int weak_match = 0;
|
|
|
|
int match = 0;
|
|
|
|
|
|
|
|
for (weak_match = match = 0; refs; refs = refs->next) {
|
|
|
|
char *name = refs->name;
|
|
|
|
int namelen = strlen(name);
|
|
|
|
|
2007-11-11 17:01:47 +03:00
|
|
|
if (!refname_match(pattern, name, ref_rev_parse_rules))
|
2007-05-12 19:45:59 +04:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* A match is "weak" if it is with refs outside
|
|
|
|
* heads or tags, and did not specify the pattern
|
|
|
|
* in full (e.g. "refs/remotes/origin/master") or at
|
|
|
|
* least from the toplevel (e.g. "remotes/origin/master");
|
|
|
|
* otherwise "git push $URL master" would result in
|
|
|
|
* ambiguity between remotes/origin/master and heads/master
|
|
|
|
* at the remote site.
|
|
|
|
*/
|
|
|
|
if (namelen != patlen &&
|
|
|
|
patlen != namelen - 5 &&
|
|
|
|
prefixcmp(name, "refs/heads/") &&
|
|
|
|
prefixcmp(name, "refs/tags/")) {
|
|
|
|
/* We want to catch the case where only weak
|
|
|
|
* matches are found and there are multiple
|
|
|
|
* matches, and where more than one strong
|
|
|
|
* matches are found, as ambiguous. One
|
|
|
|
* strong match with zero or more weak matches
|
|
|
|
* are acceptable as a unique match.
|
|
|
|
*/
|
|
|
|
matched_weak = refs;
|
|
|
|
weak_match++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
matched = refs;
|
|
|
|
match++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!matched) {
|
|
|
|
*matched_ref = matched_weak;
|
|
|
|
return weak_match;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*matched_ref = matched;
|
|
|
|
return match;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-10 08:47:26 +04:00
|
|
|
static void tail_link_ref(struct ref *ref, struct ref ***tail)
|
2007-05-12 19:45:59 +04:00
|
|
|
{
|
|
|
|
**tail = ref;
|
2007-07-10 08:47:26 +04:00
|
|
|
while (ref->next)
|
|
|
|
ref = ref->next;
|
2007-05-12 19:45:59 +04:00
|
|
|
*tail = &ref->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ref *try_explicit_object_name(const char *name)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
struct ref *ref;
|
|
|
|
|
|
|
|
if (!*name) {
|
2008-10-18 12:44:18 +04:00
|
|
|
ref = alloc_ref("(delete)");
|
2007-05-12 19:45:59 +04:00
|
|
|
hashclr(ref->new_sha1);
|
|
|
|
return ref;
|
|
|
|
}
|
|
|
|
if (get_sha1(name, sha1))
|
|
|
|
return NULL;
|
2008-10-18 12:44:18 +04:00
|
|
|
ref = alloc_ref(name);
|
2007-05-12 19:45:59 +04:00
|
|
|
hashcpy(ref->new_sha1, sha1);
|
|
|
|
return ref;
|
|
|
|
}
|
|
|
|
|
2007-07-10 08:47:26 +04:00
|
|
|
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
|
2007-05-12 19:45:59 +04:00
|
|
|
{
|
2008-10-18 12:44:18 +04:00
|
|
|
struct ref *ret = alloc_ref(name);
|
2007-07-10 08:47:26 +04:00
|
|
|
tail_link_ref(ret, tail);
|
|
|
|
return ret;
|
2007-06-09 11:07:34 +04:00
|
|
|
}
|
2007-05-25 09:20:56 +04:00
|
|
|
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 13:16:06 +04:00
|
|
|
static char *guess_ref(const char *name, struct ref *peer)
|
|
|
|
{
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
const char *r = resolve_ref(peer->name, sha1, 1, NULL);
|
|
|
|
if (!r)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!prefixcmp(r, "refs/heads/"))
|
|
|
|
strbuf_addstr(&buf, "refs/heads/");
|
|
|
|
else if (!prefixcmp(r, "refs/tags/"))
|
|
|
|
strbuf_addstr(&buf, "refs/tags/");
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
strbuf_addstr(&buf, name);
|
|
|
|
return strbuf_detach(&buf, NULL);
|
|
|
|
}
|
|
|
|
|
2007-06-09 10:22:58 +04:00
|
|
|
static int match_explicit(struct ref *src, struct ref *dst,
|
|
|
|
struct ref ***dst_tail,
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 20:15:02 +04:00
|
|
|
struct refspec *rs)
|
2007-05-12 19:45:59 +04:00
|
|
|
{
|
2007-06-09 10:22:58 +04:00
|
|
|
struct ref *matched_src, *matched_dst;
|
2009-02-25 11:32:16 +03:00
|
|
|
int copy_src;
|
2007-05-25 09:20:56 +04:00
|
|
|
|
2007-06-09 10:22:58 +04:00
|
|
|
const char *dst_value = rs->dst;
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 13:16:06 +04:00
|
|
|
char *dst_guess;
|
2007-05-12 19:45:59 +04:00
|
|
|
|
2008-04-28 19:32:12 +04:00
|
|
|
if (rs->pattern || rs->matching)
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 20:15:02 +04:00
|
|
|
return 0;
|
2007-05-25 09:20:56 +04:00
|
|
|
|
2007-06-09 10:22:58 +04:00
|
|
|
matched_src = matched_dst = NULL;
|
|
|
|
switch (count_refspec_match(rs->src, src, &matched_src)) {
|
|
|
|
case 1:
|
2009-02-25 11:32:16 +03:00
|
|
|
copy_src = 1;
|
2007-06-09 10:22:58 +04:00
|
|
|
break;
|
|
|
|
case 0:
|
|
|
|
/* The source could be in the get_sha1() format
|
|
|
|
* not a reference name. :refs/other is a
|
|
|
|
* way to delete 'other' ref at the remote end.
|
|
|
|
*/
|
|
|
|
matched_src = try_explicit_object_name(rs->src);
|
2007-09-25 08:13:19 +04:00
|
|
|
if (!matched_src)
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 20:15:02 +04:00
|
|
|
return error("src refspec %s does not match any.", rs->src);
|
2009-02-25 11:32:16 +03:00
|
|
|
copy_src = 0;
|
2007-06-09 10:22:58 +04:00
|
|
|
break;
|
|
|
|
default:
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 20:15:02 +04:00
|
|
|
return error("src refspec %s matches more than one.", rs->src);
|
2007-06-09 10:22:58 +04:00
|
|
|
}
|
2007-06-09 11:14:04 +04:00
|
|
|
|
2007-09-25 08:13:25 +04:00
|
|
|
if (!dst_value) {
|
2008-02-20 20:54:05 +03:00
|
|
|
unsigned char sha1[20];
|
|
|
|
int flag;
|
|
|
|
|
|
|
|
dst_value = resolve_ref(matched_src->name, sha1, 1, &flag);
|
|
|
|
if (!dst_value ||
|
|
|
|
((flag & REF_ISSYMREF) &&
|
|
|
|
prefixcmp(dst_value, "refs/heads/")))
|
|
|
|
die("%s cannot be resolved to branch.",
|
|
|
|
matched_src->name);
|
2007-09-25 08:13:25 +04:00
|
|
|
}
|
2007-06-09 11:14:04 +04:00
|
|
|
|
2007-06-09 10:22:58 +04:00
|
|
|
switch (count_refspec_match(dst_value, dst, &matched_dst)) {
|
|
|
|
case 1:
|
|
|
|
break;
|
|
|
|
case 0:
|
2007-06-09 11:07:34 +04:00
|
|
|
if (!memcmp(dst_value, "refs/", 5))
|
2007-07-10 08:47:26 +04:00
|
|
|
matched_dst = make_linked_ref(dst_value, dst_tail);
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 13:16:06 +04:00
|
|
|
else if((dst_guess = guess_ref(dst_value, matched_src)))
|
|
|
|
matched_dst = make_linked_ref(dst_guess, dst_tail);
|
2007-06-09 11:14:04 +04:00
|
|
|
else
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 13:16:06 +04:00
|
|
|
error("unable to push to unqualified destination: %s\n"
|
|
|
|
"The destination refspec neither matches an "
|
|
|
|
"existing ref on the remote nor\n"
|
|
|
|
"begins with refs/, and we are unable to "
|
|
|
|
"guess a prefix based on the source ref.",
|
|
|
|
dst_value);
|
2007-06-09 10:22:58 +04:00
|
|
|
break;
|
|
|
|
default:
|
2007-06-09 11:14:04 +04:00
|
|
|
matched_dst = NULL;
|
2007-06-09 10:22:58 +04:00
|
|
|
error("dst refspec %s matches more than one.",
|
|
|
|
dst_value);
|
|
|
|
break;
|
|
|
|
}
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 20:15:02 +04:00
|
|
|
if (!matched_dst)
|
|
|
|
return -1;
|
|
|
|
if (matched_dst->peer_ref)
|
|
|
|
return error("dst ref %s receives from more than one src.",
|
2007-06-09 10:22:58 +04:00
|
|
|
matched_dst->name);
|
|
|
|
else {
|
2009-02-25 11:32:16 +03:00
|
|
|
matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
|
2007-06-09 10:22:58 +04:00
|
|
|
matched_dst->force = rs->force;
|
2007-05-12 19:45:59 +04:00
|
|
|
}
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 20:15:02 +04:00
|
|
|
return 0;
|
2007-06-09 10:22:58 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int match_explicit_refs(struct ref *src, struct ref *dst,
|
|
|
|
struct ref ***dst_tail, struct refspec *rs,
|
|
|
|
int rs_nr)
|
|
|
|
{
|
|
|
|
int i, errs;
|
|
|
|
for (i = errs = 0; i < rs_nr; i++)
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 20:15:02 +04:00
|
|
|
errs += match_explicit(src, dst, dst_tail, &rs[i]);
|
|
|
|
return errs;
|
2007-05-12 19:45:59 +04:00
|
|
|
}
|
|
|
|
|
2007-06-08 03:43:05 +04:00
|
|
|
static const struct refspec *check_pattern_match(const struct refspec *rs,
|
|
|
|
int rs_nr,
|
|
|
|
const struct ref *src)
|
2007-05-25 09:20:56 +04:00
|
|
|
{
|
|
|
|
int i;
|
2008-04-28 19:32:12 +04:00
|
|
|
int matching_refs = -1;
|
2007-05-25 09:20:56 +04:00
|
|
|
for (i = 0; i < rs_nr; i++) {
|
2008-04-28 19:32:12 +04:00
|
|
|
if (rs[i].matching &&
|
|
|
|
(matching_refs == -1 || rs[i].force)) {
|
|
|
|
matching_refs = i;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-03-07 09:11:34 +03:00
|
|
|
if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name,
|
|
|
|
NULL, NULL))
|
2007-06-08 03:43:05 +04:00
|
|
|
return rs + i;
|
2007-05-25 09:20:56 +04:00
|
|
|
}
|
2008-04-28 19:32:12 +04:00
|
|
|
if (matching_refs != -1)
|
|
|
|
return rs + matching_refs;
|
|
|
|
else
|
|
|
|
return NULL;
|
2007-05-25 09:20:56 +04:00
|
|
|
}
|
|
|
|
|
2007-06-09 10:22:58 +04:00
|
|
|
/*
|
|
|
|
* Note. This is used only by "push"; refspec matching rules for
|
|
|
|
* push and fetch are subtly different, so do not try to reuse it
|
|
|
|
* without thinking.
|
|
|
|
*/
|
2007-05-12 19:45:59 +04:00
|
|
|
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
|
2007-11-10 02:32:10 +03:00
|
|
|
int nr_refspec, const char **refspec, int flags)
|
2007-05-12 19:45:59 +04:00
|
|
|
{
|
2008-04-28 19:32:12 +04:00
|
|
|
struct refspec *rs;
|
2007-11-10 02:32:10 +03:00
|
|
|
int send_all = flags & MATCH_REFS_ALL;
|
|
|
|
int send_mirror = flags & MATCH_REFS_MIRROR;
|
2009-02-25 11:32:17 +03:00
|
|
|
int errs;
|
2008-04-28 19:32:12 +04:00
|
|
|
static const char *default_refspec[] = { ":", 0 };
|
2007-05-12 19:45:59 +04:00
|
|
|
|
2008-04-28 19:32:12 +04:00
|
|
|
if (!nr_refspec) {
|
|
|
|
nr_refspec = 1;
|
|
|
|
refspec = default_refspec;
|
|
|
|
}
|
|
|
|
rs = parse_push_refspec(nr_refspec, (const char **) refspec);
|
2009-02-25 11:32:17 +03:00
|
|
|
errs = match_explicit_refs(src, dst, dst_tail, rs, nr_refspec);
|
2007-05-12 19:45:59 +04:00
|
|
|
|
|
|
|
/* pick the remainder */
|
|
|
|
for ( ; src; src = src->next) {
|
|
|
|
struct ref *dst_peer;
|
2007-06-08 03:43:05 +04:00
|
|
|
const struct refspec *pat = NULL;
|
|
|
|
char *dst_name;
|
2007-05-12 19:45:59 +04:00
|
|
|
if (src->peer_ref)
|
|
|
|
continue;
|
2008-04-28 19:32:12 +04:00
|
|
|
|
|
|
|
pat = check_pattern_match(rs, nr_refspec, src);
|
|
|
|
if (!pat)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (pat->matching) {
|
2007-07-02 06:00:08 +04:00
|
|
|
/*
|
|
|
|
* "matching refs"; traditionally we pushed everything
|
|
|
|
* including refs outside refs/heads/ hierarchy, but
|
|
|
|
* that does not make much sense these days.
|
|
|
|
*/
|
2008-04-28 19:32:12 +04:00
|
|
|
if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
|
|
|
|
continue;
|
|
|
|
dst_name = xstrdup(src->name);
|
2007-05-25 09:20:56 +04:00
|
|
|
|
2008-04-28 19:32:12 +04:00
|
|
|
} else {
|
2007-06-15 18:22:37 +04:00
|
|
|
const char *dst_side = pat->dst ? pat->dst : pat->src;
|
2009-03-07 09:11:34 +03:00
|
|
|
if (!match_name_with_pattern(pat->src, src->name,
|
|
|
|
dst_side, &dst_name))
|
|
|
|
die("Didn't think it matches any more");
|
2008-04-28 19:32:12 +04:00
|
|
|
}
|
2007-06-08 03:43:05 +04:00
|
|
|
dst_peer = find_ref_by_name(dst, dst_name);
|
2008-04-28 19:32:12 +04:00
|
|
|
if (dst_peer) {
|
|
|
|
if (dst_peer->peer_ref)
|
|
|
|
/* We're already sending something to this ref. */
|
|
|
|
goto free_name;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
if (pat->matching && !(send_all || send_mirror))
|
|
|
|
/*
|
|
|
|
* Remote doesn't have it, and we have no
|
|
|
|
* explicit pattern, and we don't have
|
|
|
|
* --all nor --mirror.
|
|
|
|
*/
|
|
|
|
goto free_name;
|
2007-11-10 02:32:10 +03:00
|
|
|
|
2007-05-12 19:45:59 +04:00
|
|
|
/* Create a new one and link it */
|
2007-07-10 08:47:26 +04:00
|
|
|
dst_peer = make_linked_ref(dst_name, dst_tail);
|
2007-05-12 19:45:59 +04:00
|
|
|
hashcpy(dst_peer->new_sha1, src->new_sha1);
|
|
|
|
}
|
2009-02-25 11:32:16 +03:00
|
|
|
dst_peer->peer_ref = copy_ref(src);
|
2008-04-28 19:32:12 +04:00
|
|
|
dst_peer->force = pat->force;
|
2007-06-08 03:43:05 +04:00
|
|
|
free_name:
|
|
|
|
free(dst_name);
|
2007-05-12 19:45:59 +04:00
|
|
|
}
|
2009-02-25 11:32:17 +03:00
|
|
|
if (errs)
|
|
|
|
return -1;
|
2007-05-12 19:45:59 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2007-09-11 07:02:56 +04:00
|
|
|
|
|
|
|
struct branch *branch_get(const char *name)
|
|
|
|
{
|
|
|
|
struct branch *ret;
|
|
|
|
|
|
|
|
read_config();
|
|
|
|
if (!name || !*name || !strcmp(name, "HEAD"))
|
|
|
|
ret = current_branch;
|
|
|
|
else
|
|
|
|
ret = make_branch(name, 0);
|
|
|
|
if (ret && ret->remote_name) {
|
|
|
|
ret->remote = remote_get(ret->remote_name);
|
|
|
|
if (ret->merge_nr) {
|
|
|
|
int i;
|
|
|
|
ret->merge = xcalloc(sizeof(*ret->merge),
|
|
|
|
ret->merge_nr);
|
|
|
|
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]);
|
2009-04-02 01:42:49 +04:00
|
|
|
if (remote_find_tracking(ret->remote, ret->merge[i])
|
|
|
|
&& !strcmp(ret->remote_name, "."))
|
|
|
|
ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
|
2007-09-11 07:02:56 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int branch_has_merge_config(struct branch *branch)
|
|
|
|
{
|
|
|
|
return branch && !!branch->merge;
|
|
|
|
}
|
|
|
|
|
2007-09-18 12:54:53 +04:00
|
|
|
int branch_merge_matches(struct branch *branch,
|
|
|
|
int i,
|
|
|
|
const char *refname)
|
2007-09-11 07:02:56 +04:00
|
|
|
{
|
2007-09-18 12:54:53 +04:00
|
|
|
if (!branch || i < 0 || i >= branch->merge_nr)
|
2007-09-11 07:02:56 +04:00
|
|
|
return 0;
|
2007-11-11 17:01:48 +03:00
|
|
|
return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
|
2007-09-11 07:02:56 +04:00
|
|
|
}
|
2007-09-11 07:03:08 +04:00
|
|
|
|
2007-10-30 04:05:40 +03:00
|
|
|
static struct ref *get_expanded_map(const struct ref *remote_refs,
|
2007-09-11 07:03:08 +04:00
|
|
|
const struct refspec *refspec)
|
|
|
|
{
|
2007-10-30 04:05:40 +03:00
|
|
|
const struct ref *ref;
|
2007-09-11 07:03:08 +04:00
|
|
|
struct ref *ret = NULL;
|
|
|
|
struct ref **tail = &ret;
|
|
|
|
|
2009-03-07 09:11:34 +03:00
|
|
|
char *expn_name;
|
2007-09-11 07:03:08 +04:00
|
|
|
|
|
|
|
for (ref = remote_refs; ref; ref = ref->next) {
|
|
|
|
if (strchr(ref->name, '^'))
|
|
|
|
continue; /* a dereference item */
|
2009-03-07 09:11:34 +03:00
|
|
|
if (match_name_with_pattern(refspec->src, ref->name,
|
|
|
|
refspec->dst, &expn_name)) {
|
2007-09-11 07:03:08 +04:00
|
|
|
struct ref *cpy = copy_ref(ref);
|
|
|
|
|
2009-03-07 09:11:34 +03:00
|
|
|
cpy->peer_ref = alloc_ref(expn_name);
|
|
|
|
free(expn_name);
|
2007-09-11 07:03:08 +04:00
|
|
|
if (refspec->force)
|
|
|
|
cpy->peer_ref->force = 1;
|
|
|
|
*tail = cpy;
|
|
|
|
tail = &cpy->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-10-30 04:05:40 +03:00
|
|
|
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
|
2007-09-11 07:03:08 +04:00
|
|
|
{
|
2007-10-30 04:05:40 +03:00
|
|
|
const struct ref *ref;
|
2007-09-11 07:03:08 +04:00
|
|
|
for (ref = refs; ref; ref = ref->next) {
|
2007-11-11 17:01:48 +03:00
|
|
|
if (refname_match(name, ref->name, ref_fetch_rules))
|
2007-09-11 07:03:08 +04:00
|
|
|
return ref;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-10-30 04:05:40 +03:00
|
|
|
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
|
2007-09-11 07:03:08 +04:00
|
|
|
{
|
2007-10-30 04:05:40 +03:00
|
|
|
const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
|
2007-09-11 07:03:08 +04:00
|
|
|
|
|
|
|
if (!ref)
|
2007-10-27 10:09:48 +04:00
|
|
|
return NULL;
|
2007-09-11 07:03:08 +04:00
|
|
|
|
|
|
|
return copy_ref(ref);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ref *get_local_ref(const char *name)
|
|
|
|
{
|
|
|
|
if (!name)
|
|
|
|
return NULL;
|
|
|
|
|
2008-10-18 12:44:18 +04:00
|
|
|
if (!prefixcmp(name, "refs/"))
|
|
|
|
return alloc_ref(name);
|
2007-09-11 07:03:08 +04:00
|
|
|
|
|
|
|
if (!prefixcmp(name, "heads/") ||
|
|
|
|
!prefixcmp(name, "tags/") ||
|
2008-10-18 12:37:40 +04:00
|
|
|
!prefixcmp(name, "remotes/"))
|
|
|
|
return alloc_ref_with_prefix("refs/", 5, name);
|
2007-09-11 07:03:08 +04:00
|
|
|
|
2008-10-18 12:37:40 +04:00
|
|
|
return alloc_ref_with_prefix("refs/heads/", 11, name);
|
2007-09-11 07:03:08 +04:00
|
|
|
}
|
|
|
|
|
2007-10-30 04:05:40 +03:00
|
|
|
int get_fetch_map(const struct ref *remote_refs,
|
2007-09-11 07:03:08 +04:00
|
|
|
const struct refspec *refspec,
|
2007-10-27 10:09:48 +04:00
|
|
|
struct ref ***tail,
|
|
|
|
int missing_ok)
|
2007-09-11 07:03:08 +04:00
|
|
|
{
|
2008-03-18 05:05:23 +03:00
|
|
|
struct ref *ref_map, **rmp;
|
2007-09-11 07:03:08 +04:00
|
|
|
|
|
|
|
if (refspec->pattern) {
|
|
|
|
ref_map = get_expanded_map(remote_refs, refspec);
|
|
|
|
} else {
|
2007-10-27 10:09:48 +04:00
|
|
|
const char *name = refspec->src[0] ? refspec->src : "HEAD";
|
|
|
|
|
|
|
|
ref_map = get_remote_ref(remote_refs, name);
|
|
|
|
if (!missing_ok && !ref_map)
|
|
|
|
die("Couldn't find remote ref %s", name);
|
|
|
|
if (ref_map) {
|
|
|
|
ref_map->peer_ref = get_local_ref(refspec->dst);
|
|
|
|
if (ref_map->peer_ref && refspec->force)
|
|
|
|
ref_map->peer_ref->force = 1;
|
|
|
|
}
|
2007-09-11 07:03:08 +04:00
|
|
|
}
|
|
|
|
|
2008-03-18 05:05:23 +03:00
|
|
|
for (rmp = &ref_map; *rmp; ) {
|
|
|
|
if ((*rmp)->peer_ref) {
|
|
|
|
int st = check_ref_format((*rmp)->peer_ref->name + 5);
|
|
|
|
if (st && st != CHECK_REF_FORMAT_ONELEVEL) {
|
|
|
|
struct ref *ignore = *rmp;
|
|
|
|
error("* Ignoring funny ref '%s' locally",
|
|
|
|
(*rmp)->peer_ref->name);
|
|
|
|
*rmp = (*rmp)->next;
|
|
|
|
free(ignore->peer_ref);
|
|
|
|
free(ignore);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rmp = &((*rmp)->next);
|
2007-09-11 07:03:08 +04:00
|
|
|
}
|
|
|
|
|
2007-10-13 00:40:04 +04:00
|
|
|
if (ref_map)
|
|
|
|
tail_link_ref(ref_map, tail);
|
2007-09-11 07:03:08 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2008-04-26 23:53:12 +04:00
|
|
|
|
|
|
|
int resolve_remote_symref(struct ref *ref, struct ref *list)
|
|
|
|
{
|
|
|
|
if (!ref->symref)
|
|
|
|
return 0;
|
|
|
|
for (; list; list = list->next)
|
|
|
|
if (!strcmp(ref->symref, list->name)) {
|
|
|
|
hashcpy(ref->old_sha1, list->old_sha1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
2008-07-02 11:51:18 +04:00
|
|
|
|
2009-02-25 11:32:12 +03:00
|
|
|
static void unmark_and_free(struct commit_list *list, unsigned int mark)
|
|
|
|
{
|
|
|
|
while (list) {
|
|
|
|
struct commit_list *temp = list;
|
|
|
|
temp->item->object.flags &= ~mark;
|
|
|
|
list = temp->next;
|
|
|
|
free(temp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
|
|
|
|
{
|
|
|
|
struct object *o;
|
|
|
|
struct commit *old, *new;
|
|
|
|
struct commit_list *list, *used;
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
/* Both new and old must be commit-ish and new is descendant of
|
|
|
|
* old. Otherwise we require --force.
|
|
|
|
*/
|
|
|
|
o = deref_tag(parse_object(old_sha1), NULL, 0);
|
|
|
|
if (!o || o->type != OBJ_COMMIT)
|
|
|
|
return 0;
|
|
|
|
old = (struct commit *) o;
|
|
|
|
|
|
|
|
o = deref_tag(parse_object(new_sha1), NULL, 0);
|
|
|
|
if (!o || o->type != OBJ_COMMIT)
|
|
|
|
return 0;
|
|
|
|
new = (struct commit *) o;
|
|
|
|
|
|
|
|
if (parse_commit(new) < 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
used = list = NULL;
|
|
|
|
commit_list_insert(new, &list);
|
|
|
|
while (list) {
|
|
|
|
new = pop_most_recent_commit(&list, TMP_MARK);
|
|
|
|
commit_list_insert(new, &used);
|
|
|
|
if (new == old) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
unmark_and_free(list, TMP_MARK);
|
|
|
|
unmark_and_free(used, TMP_MARK);
|
|
|
|
return found;
|
|
|
|
}
|
|
|
|
|
2008-07-02 11:51:18 +04:00
|
|
|
/*
|
|
|
|
* Return true if there is anything to report, otherwise false.
|
|
|
|
*/
|
|
|
|
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
struct commit *ours, *theirs;
|
|
|
|
char symmetric[84];
|
|
|
|
struct rev_info revs;
|
|
|
|
const char *rev_argv[10], *base;
|
|
|
|
int rev_argc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Nothing to report unless we are marked to build on top of
|
|
|
|
* somebody else.
|
|
|
|
*/
|
|
|
|
if (!branch ||
|
|
|
|
!branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If what we used to build on no longer exists, there is
|
|
|
|
* nothing to report.
|
|
|
|
*/
|
|
|
|
base = branch->merge[0]->dst;
|
|
|
|
if (!resolve_ref(base, sha1, 1, NULL))
|
|
|
|
return 0;
|
|
|
|
theirs = lookup_commit(sha1);
|
|
|
|
if (!theirs)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!resolve_ref(branch->refname, sha1, 1, NULL))
|
|
|
|
return 0;
|
|
|
|
ours = lookup_commit(sha1);
|
|
|
|
if (!ours)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* are we the same? */
|
|
|
|
if (theirs == ours)
|
|
|
|
return 0;
|
|
|
|
|
2009-04-22 03:32:18 +04:00
|
|
|
/* Run "rev-list --left-right ours...theirs" internally... */
|
2008-07-02 11:51:18 +04:00
|
|
|
rev_argc = 0;
|
|
|
|
rev_argv[rev_argc++] = NULL;
|
|
|
|
rev_argv[rev_argc++] = "--left-right";
|
|
|
|
rev_argv[rev_argc++] = symmetric;
|
|
|
|
rev_argv[rev_argc++] = "--";
|
|
|
|
rev_argv[rev_argc] = NULL;
|
|
|
|
|
|
|
|
strcpy(symmetric, sha1_to_hex(ours->object.sha1));
|
|
|
|
strcpy(symmetric + 40, "...");
|
|
|
|
strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));
|
|
|
|
|
|
|
|
init_revisions(&revs, NULL);
|
|
|
|
setup_revisions(rev_argc, rev_argv, &revs, NULL);
|
|
|
|
prepare_revision_walk(&revs);
|
|
|
|
|
|
|
|
/* ... and count the commits on each side. */
|
|
|
|
*num_ours = 0;
|
|
|
|
*num_theirs = 0;
|
|
|
|
while (1) {
|
|
|
|
struct commit *c = get_revision(&revs);
|
|
|
|
if (!c)
|
|
|
|
break;
|
|
|
|
if (c->object.flags & SYMMETRIC_LEFT)
|
|
|
|
(*num_ours)++;
|
|
|
|
else
|
|
|
|
(*num_theirs)++;
|
|
|
|
}
|
2008-07-03 23:09:48 +04:00
|
|
|
|
|
|
|
/* clear object flags smudged by the above traversal */
|
|
|
|
clear_commit_marks(ours, ALL_REV_FLAGS);
|
|
|
|
clear_commit_marks(theirs, ALL_REV_FLAGS);
|
2008-07-02 11:51:18 +04:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return true when there is anything to report, otherwise false.
|
|
|
|
*/
|
|
|
|
int format_tracking_info(struct branch *branch, struct strbuf *sb)
|
|
|
|
{
|
|
|
|
int num_ours, num_theirs;
|
2008-07-16 23:19:27 +04:00
|
|
|
const char *base;
|
2008-07-02 11:51:18 +04:00
|
|
|
|
|
|
|
if (!stat_tracking_info(branch, &num_ours, &num_theirs))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
base = branch->merge[0]->dst;
|
2009-04-16 12:20:44 +04:00
|
|
|
base = shorten_unambiguous_ref(base, 0);
|
2008-07-02 11:51:18 +04:00
|
|
|
if (!num_theirs)
|
2008-07-16 23:19:27 +04:00
|
|
|
strbuf_addf(sb, "Your branch is ahead of '%s' "
|
2008-07-02 11:51:18 +04:00
|
|
|
"by %d commit%s.\n",
|
2008-07-16 23:19:27 +04:00
|
|
|
base, num_ours, (num_ours == 1) ? "" : "s");
|
2008-07-02 11:51:18 +04:00
|
|
|
else if (!num_ours)
|
2008-07-16 23:19:27 +04:00
|
|
|
strbuf_addf(sb, "Your branch is behind '%s' "
|
|
|
|
"by %d commit%s, "
|
2008-07-02 11:51:18 +04:00
|
|
|
"and can be fast-forwarded.\n",
|
2008-07-16 23:19:27 +04:00
|
|
|
base, num_theirs, (num_theirs == 1) ? "" : "s");
|
2008-07-02 11:51:18 +04:00
|
|
|
else
|
2008-07-16 23:19:27 +04:00
|
|
|
strbuf_addf(sb, "Your branch and '%s' have diverged,\n"
|
|
|
|
"and have %d and %d different commit(s) each, "
|
|
|
|
"respectively.\n",
|
|
|
|
base, num_ours, num_theirs);
|
2008-07-02 11:51:18 +04:00
|
|
|
return 1;
|
|
|
|
}
|
2009-02-25 11:32:11 +03:00
|
|
|
|
|
|
|
static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
|
|
|
|
{
|
|
|
|
struct ref ***local_tail = cb_data;
|
|
|
|
struct ref *ref;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
/* we already know it starts with refs/ to get here */
|
|
|
|
if (check_ref_format(refname + 5))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
len = strlen(refname) + 1;
|
|
|
|
ref = xcalloc(1, sizeof(*ref) + len);
|
|
|
|
hashcpy(ref->new_sha1, sha1);
|
|
|
|
memcpy(ref->name, refname, len);
|
|
|
|
**local_tail = ref;
|
|
|
|
*local_tail = &ref->next;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct ref *get_local_heads(void)
|
|
|
|
{
|
2009-04-17 02:16:23 +04:00
|
|
|
struct ref *local_refs = NULL, **local_tail = &local_refs;
|
2009-02-25 11:32:11 +03:00
|
|
|
for_each_ref(one_local_ref, &local_tail);
|
|
|
|
return local_refs;
|
|
|
|
}
|
2009-02-25 11:32:13 +03:00
|
|
|
|
2009-02-27 22:10:05 +03:00
|
|
|
struct ref *guess_remote_head(const struct ref *head,
|
|
|
|
const struct ref *refs,
|
|
|
|
int all)
|
2009-02-25 11:32:13 +03:00
|
|
|
{
|
|
|
|
const struct ref *r;
|
2009-02-27 22:10:05 +03:00
|
|
|
struct ref *list = NULL;
|
|
|
|
struct ref **tail = &list;
|
2009-02-25 11:32:13 +03:00
|
|
|
|
2009-02-25 11:32:14 +03:00
|
|
|
if (!head)
|
2009-02-25 11:32:13 +03:00
|
|
|
return NULL;
|
|
|
|
|
2009-02-27 22:10:06 +03:00
|
|
|
/*
|
|
|
|
* Some transports support directly peeking at
|
|
|
|
* where HEAD points; if that is the case, then
|
|
|
|
* we don't have to guess.
|
|
|
|
*/
|
|
|
|
if (head->symref)
|
|
|
|
return copy_ref(find_ref_by_name(refs, head->symref));
|
|
|
|
|
2009-02-25 11:32:13 +03:00
|
|
|
/* If refs/heads/master could be right, it is. */
|
2009-02-27 22:10:05 +03:00
|
|
|
if (!all) {
|
|
|
|
r = find_ref_by_name(refs, "refs/heads/master");
|
|
|
|
if (r && !hashcmp(r->old_sha1, head->old_sha1))
|
|
|
|
return copy_ref(r);
|
|
|
|
}
|
2009-02-25 11:32:13 +03:00
|
|
|
|
|
|
|
/* Look for another ref that points there */
|
2009-02-27 22:10:05 +03:00
|
|
|
for (r = refs; r; r = r->next) {
|
|
|
|
if (r != head && !hashcmp(r->old_sha1, head->old_sha1)) {
|
|
|
|
*tail = copy_ref(r);
|
|
|
|
tail = &((*tail)->next);
|
|
|
|
if (!all)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2009-02-25 11:32:13 +03:00
|
|
|
|
2009-02-27 22:10:05 +03:00
|
|
|
return list;
|
2009-02-25 11:32:13 +03:00
|
|
|
}
|