2007-09-11 03:03:25 +00:00
|
|
|
/*
|
|
|
|
* "git fetch"
|
|
|
|
*/
|
|
|
|
#include "cache.h"
|
|
|
|
#include "refs.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "builtin.h"
|
2008-07-21 18:03:49 +00:00
|
|
|
#include "string-list.h"
|
2007-09-11 03:03:25 +00:00
|
|
|
#include "remote.h"
|
|
|
|
#include "transport.h"
|
2007-11-11 07:29:47 +00:00
|
|
|
#include "run-command.h"
|
2007-12-04 07:25:47 +00:00
|
|
|
#include "parse-options.h"
|
chain kill signals for cleanup functions
If a piece of code wanted to do some cleanup before exiting
(e.g., cleaning up a lockfile or a tempfile), our usual
strategy was to install a signal handler that did something
like this:
do_cleanup(); /* actual work */
signal(signo, SIG_DFL); /* restore previous behavior */
raise(signo); /* deliver signal, killing ourselves */
For a single handler, this works fine. However, if we want
to clean up two _different_ things, we run into a problem.
The most recently installed handler will run, but when it
removes itself as a handler, it doesn't put back the first
handler.
This patch introduces sigchain, a tiny library for handling
a stack of signal handlers. You sigchain_push each handler,
and use sigchain_pop to restore whoever was before you in
the stack.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-22 06:02:35 +00:00
|
|
|
#include "sigchain.h"
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-12-04 07:25:47 +00:00
|
|
|
static const char * const builtin_fetch_usage[] = {
|
2008-07-13 13:36:15 +00:00
|
|
|
"git fetch [options] [<repository> <refspec>...]",
|
2007-12-04 07:25:47 +00:00
|
|
|
NULL
|
|
|
|
};
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-12-04 07:25:47 +00:00
|
|
|
enum {
|
|
|
|
TAGS_UNSET = 0,
|
|
|
|
TAGS_DEFAULT = 1,
|
|
|
|
TAGS_SET = 2
|
|
|
|
};
|
|
|
|
|
2008-11-15 00:14:24 +00:00
|
|
|
static int append, force, keep, update_head_ok, verbosity;
|
2007-12-04 07:25:47 +00:00
|
|
|
static int tags = TAGS_DEFAULT;
|
2007-11-11 07:29:47 +00:00
|
|
|
static const char *depth;
|
2007-12-04 07:25:47 +00:00
|
|
|
static const char *upload_pack;
|
2007-12-04 07:25:46 +00:00
|
|
|
static struct strbuf default_rla = STRBUF_INIT;
|
2007-09-14 07:31:25 +00:00
|
|
|
static struct transport *transport;
|
|
|
|
|
2007-12-04 07:25:47 +00:00
|
|
|
static struct option builtin_fetch_options[] = {
|
2008-11-15 00:14:24 +00:00
|
|
|
OPT__VERBOSITY(&verbosity),
|
2007-12-04 07:25:47 +00:00
|
|
|
OPT_BOOLEAN('a', "append", &append,
|
|
|
|
"append to .git/FETCH_HEAD instead of overwriting"),
|
|
|
|
OPT_STRING(0, "upload-pack", &upload_pack, "PATH",
|
|
|
|
"path to upload pack on remote end"),
|
|
|
|
OPT_BOOLEAN('f', "force", &force,
|
|
|
|
"force overwrite of local branch"),
|
|
|
|
OPT_SET_INT('t', "tags", &tags,
|
|
|
|
"fetch all tags and associated objects", TAGS_SET),
|
2008-03-13 07:13:15 +00:00
|
|
|
OPT_SET_INT('n', NULL, &tags,
|
|
|
|
"do not fetch all tags (--no-tags)", TAGS_UNSET),
|
2007-12-04 07:25:47 +00:00
|
|
|
OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
|
|
|
|
OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
|
|
|
|
"allow updating of HEAD ref"),
|
|
|
|
OPT_STRING(0, "depth", &depth, "DEPTH",
|
|
|
|
"deepen history of shallow clone"),
|
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
2007-09-14 07:31:25 +00:00
|
|
|
static void unlock_pack(void)
|
|
|
|
{
|
|
|
|
if (transport)
|
|
|
|
transport_unlock_pack(transport);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void unlock_pack_on_signal(int signo)
|
|
|
|
{
|
|
|
|
unlock_pack();
|
chain kill signals for cleanup functions
If a piece of code wanted to do some cleanup before exiting
(e.g., cleaning up a lockfile or a tempfile), our usual
strategy was to install a signal handler that did something
like this:
do_cleanup(); /* actual work */
signal(signo, SIG_DFL); /* restore previous behavior */
raise(signo); /* deliver signal, killing ourselves */
For a single handler, this works fine. However, if we want
to clean up two _different_ things, we run into a problem.
The most recently installed handler will run, but when it
removes itself as a handler, it doesn't put back the first
handler.
This patch introduces sigchain, a tiny library for handling
a stack of signal handlers. You sigchain_push each handler,
and use sigchain_pop to restore whoever was before you in
the stack.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-22 06:02:35 +00:00
|
|
|
sigchain_pop(signo);
|
2007-09-14 07:31:25 +00:00
|
|
|
raise(signo);
|
|
|
|
}
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-09-18 08:54:53 +00:00
|
|
|
static void add_merge_config(struct ref **head,
|
2007-10-30 01:05:40 +00:00
|
|
|
const struct ref *remote_refs,
|
2007-09-18 08:54:53 +00:00
|
|
|
struct branch *branch,
|
|
|
|
struct ref ***tail)
|
2007-09-11 03:03:25 +00:00
|
|
|
{
|
2007-09-18 08:54:53 +00:00
|
|
|
int i;
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-09-18 08:54:53 +00:00
|
|
|
for (i = 0; i < branch->merge_nr; i++) {
|
|
|
|
struct ref *rm, **old_tail = *tail;
|
|
|
|
struct refspec refspec;
|
|
|
|
|
|
|
|
for (rm = *head; rm; rm = rm->next) {
|
|
|
|
if (branch_merge_matches(branch, i, rm->name)) {
|
2007-09-11 03:03:25 +00:00
|
|
|
rm->merge = 1;
|
2007-09-18 08:54:53 +00:00
|
|
|
break;
|
|
|
|
}
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
2007-09-18 08:54:53 +00:00
|
|
|
if (rm)
|
|
|
|
continue;
|
|
|
|
|
2007-10-27 06:09:48 +00:00
|
|
|
/*
|
|
|
|
* Not fetched to a tracking branch? We need to fetch
|
2007-09-18 08:54:53 +00:00
|
|
|
* it anyway to allow this branch's "branch.$name.merge"
|
2008-09-09 10:28:30 +00:00
|
|
|
* to be honored by 'git pull', but we do not have to
|
2007-10-27 06:09:48 +00:00
|
|
|
* fail if branch.$name.merge is misconfigured to point
|
|
|
|
* at a nonexisting branch. If we were indeed called by
|
2008-09-09 10:28:30 +00:00
|
|
|
* 'git pull', it will notice the misconfiguration because
|
2007-10-27 06:09:48 +00:00
|
|
|
* there is no entry in the resulting FETCH_HEAD marked
|
|
|
|
* for merging.
|
2007-09-18 08:54:53 +00:00
|
|
|
*/
|
|
|
|
refspec.src = branch->merge[i]->src;
|
|
|
|
refspec.dst = NULL;
|
|
|
|
refspec.pattern = 0;
|
|
|
|
refspec.force = 0;
|
2007-10-27 06:09:48 +00:00
|
|
|
get_fetch_map(remote_refs, &refspec, tail, 1);
|
2007-09-18 08:54:53 +00:00
|
|
|
for (rm = *old_tail; rm; rm = rm->next)
|
|
|
|
rm->merge = 1;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-03-03 02:35:25 +00:00
|
|
|
static void find_non_local_tags(struct transport *transport,
|
|
|
|
struct ref **head,
|
|
|
|
struct ref ***tail);
|
|
|
|
|
2007-09-11 03:03:25 +00:00
|
|
|
static struct ref *get_ref_map(struct transport *transport,
|
|
|
|
struct refspec *refs, int ref_count, int tags,
|
|
|
|
int *autotags)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct ref *rm;
|
|
|
|
struct ref *ref_map = NULL;
|
|
|
|
struct ref **tail = &ref_map;
|
|
|
|
|
2007-10-30 01:05:40 +00:00
|
|
|
const struct ref *remote_refs = transport_get_remote_refs(transport);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-12-04 07:25:47 +00:00
|
|
|
if (ref_count || tags == TAGS_SET) {
|
2007-09-11 03:03:25 +00:00
|
|
|
for (i = 0; i < ref_count; i++) {
|
2007-10-27 06:09:48 +00:00
|
|
|
get_fetch_map(remote_refs, &refs[i], &tail, 0);
|
2007-09-11 03:03:25 +00:00
|
|
|
if (refs[i].dst && refs[i].dst[0])
|
|
|
|
*autotags = 1;
|
|
|
|
}
|
|
|
|
/* Merge everything on the command line, but not --tags */
|
|
|
|
for (rm = ref_map; rm; rm = rm->next)
|
|
|
|
rm->merge = 1;
|
2008-04-17 23:32:35 +00:00
|
|
|
if (tags == TAGS_SET)
|
|
|
|
get_fetch_map(remote_refs, tag_refspec, &tail, 0);
|
2007-09-11 03:03:25 +00:00
|
|
|
} else {
|
|
|
|
/* Use the defaults */
|
|
|
|
struct remote *remote = transport->remote;
|
2007-09-18 08:54:53 +00:00
|
|
|
struct branch *branch = branch_get(NULL);
|
|
|
|
int has_merge = branch_has_merge_config(branch);
|
|
|
|
if (remote && (remote->fetch_refspec_nr || has_merge)) {
|
2007-09-11 03:03:25 +00:00
|
|
|
for (i = 0; i < remote->fetch_refspec_nr; i++) {
|
2007-10-27 06:09:48 +00:00
|
|
|
get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
|
2007-09-11 03:03:25 +00:00
|
|
|
if (remote->fetch[i].dst &&
|
|
|
|
remote->fetch[i].dst[0])
|
|
|
|
*autotags = 1;
|
2007-09-18 08:54:53 +00:00
|
|
|
if (!i && !has_merge && ref_map &&
|
2007-09-28 23:34:17 +00:00
|
|
|
!remote->fetch[0].pattern)
|
2007-09-18 08:54:53 +00:00
|
|
|
ref_map->merge = 1;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
2007-10-11 00:47:55 +00:00
|
|
|
/*
|
|
|
|
* if the remote we're fetching from is the same
|
|
|
|
* as given in branch.<name>.remote, we add the
|
|
|
|
* ref given in branch.<name>.merge, too.
|
|
|
|
*/
|
2007-10-27 06:09:48 +00:00
|
|
|
if (has_merge &&
|
|
|
|
!strcmp(branch->remote_name, remote->name))
|
2007-09-18 08:54:53 +00:00
|
|
|
add_merge_config(&ref_map, remote_refs, branch, &tail);
|
2007-09-11 03:03:25 +00:00
|
|
|
} else {
|
|
|
|
ref_map = get_remote_ref(remote_refs, "HEAD");
|
2007-10-27 06:09:48 +00:00
|
|
|
if (!ref_map)
|
|
|
|
die("Couldn't find remote ref HEAD");
|
2007-09-11 03:03:25 +00:00
|
|
|
ref_map->merge = 1;
|
2008-03-03 02:34:51 +00:00
|
|
|
tail = &ref_map->next;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
}
|
2008-03-03 02:35:25 +00:00
|
|
|
if (tags == TAGS_DEFAULT && *autotags)
|
|
|
|
find_non_local_tags(transport, &ref_map, &tail);
|
2007-10-08 04:25:07 +00:00
|
|
|
ref_remove_duplicates(ref_map);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
|
|
|
return ref_map;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int s_update_ref(const char *action,
|
|
|
|
struct ref *ref,
|
|
|
|
int check_old)
|
|
|
|
{
|
|
|
|
char msg[1024];
|
|
|
|
char *rla = getenv("GIT_REFLOG_ACTION");
|
|
|
|
static struct ref_lock *lock;
|
|
|
|
|
|
|
|
if (!rla)
|
2007-12-04 07:25:46 +00:00
|
|
|
rla = default_rla.buf;
|
2007-09-11 03:03:25 +00:00
|
|
|
snprintf(msg, sizeof(msg), "%s: %s", rla, action);
|
|
|
|
lock = lock_any_ref_for_update(ref->name,
|
|
|
|
check_old ? ref->old_sha1 : NULL, 0);
|
|
|
|
if (!lock)
|
2008-06-27 04:01:41 +00:00
|
|
|
return 2;
|
2007-09-11 03:03:25 +00:00
|
|
|
if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
|
2008-06-27 04:01:41 +00:00
|
|
|
return 2;
|
2007-09-11 03:03:25 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-11-03 05:32:48 +00:00
|
|
|
#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
|
2007-11-04 23:05:45 +00:00
|
|
|
#define REFCOL_WIDTH 10
|
2007-11-03 05:32:48 +00:00
|
|
|
|
2007-09-11 03:03:25 +00:00
|
|
|
static int update_local_ref(struct ref *ref,
|
2007-11-03 05:32:48 +00:00
|
|
|
const char *remote,
|
|
|
|
char *display)
|
2007-09-11 03:03:25 +00:00
|
|
|
{
|
|
|
|
struct commit *current = NULL, *updated;
|
|
|
|
enum object_type type;
|
|
|
|
struct branch *current_branch = branch_get(NULL);
|
2009-05-13 21:22:04 +00:00
|
|
|
const char *pretty_ref = prettify_refname(ref->name);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-11-03 05:32:48 +00:00
|
|
|
*display = 0;
|
2007-09-11 03:03:25 +00:00
|
|
|
type = sha1_object_info(ref->new_sha1, NULL);
|
|
|
|
if (type < 0)
|
|
|
|
die("object %s not found", sha1_to_hex(ref->new_sha1));
|
|
|
|
|
|
|
|
if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity > 0)
|
2007-11-04 23:05:45 +00:00
|
|
|
sprintf(display, "= %-*s %-*s -> %s", SUMMARY_WIDTH,
|
|
|
|
"[up to date]", REFCOL_WIDTH, remote,
|
|
|
|
pretty_ref);
|
2007-09-11 03:03:25 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-09-16 06:31:26 +00:00
|
|
|
if (current_branch &&
|
|
|
|
!strcmp(ref->name, current_branch->name) &&
|
2007-09-11 03:03:25 +00:00
|
|
|
!(update_head_ok || is_bare_repository()) &&
|
|
|
|
!is_null_sha1(ref->old_sha1)) {
|
|
|
|
/*
|
|
|
|
* If this is the head, and it's not okay to update
|
|
|
|
* the head, and the old value of the head isn't empty...
|
|
|
|
*/
|
2007-11-04 23:05:45 +00:00
|
|
|
sprintf(display, "! %-*s %-*s -> %s (can't fetch in current branch)",
|
|
|
|
SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
|
|
|
|
pretty_ref);
|
2007-09-11 03:03:25 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_null_sha1(ref->old_sha1) &&
|
|
|
|
!prefixcmp(ref->name, "refs/tags/")) {
|
2008-06-27 03:59:50 +00:00
|
|
|
int r;
|
|
|
|
r = s_update_ref("updating tag", ref, 0);
|
|
|
|
sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '-',
|
2007-11-04 23:05:45 +00:00
|
|
|
SUMMARY_WIDTH, "[tag update]", REFCOL_WIDTH, remote,
|
2008-06-27 03:59:50 +00:00
|
|
|
pretty_ref, r ? " (unable to update local ref)" : "");
|
|
|
|
return r;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
|
2007-10-19 04:54:59 +00:00
|
|
|
current = lookup_commit_reference_gently(ref->old_sha1, 1);
|
|
|
|
updated = lookup_commit_reference_gently(ref->new_sha1, 1);
|
2007-09-11 03:03:25 +00:00
|
|
|
if (!current || !updated) {
|
2007-11-03 05:32:48 +00:00
|
|
|
const char *msg;
|
|
|
|
const char *what;
|
2008-06-27 03:59:50 +00:00
|
|
|
int r;
|
2007-11-03 05:32:48 +00:00
|
|
|
if (!strncmp(ref->name, "refs/tags/", 10)) {
|
2007-09-11 03:03:25 +00:00
|
|
|
msg = "storing tag";
|
2007-11-03 05:32:48 +00:00
|
|
|
what = "[new tag]";
|
|
|
|
}
|
|
|
|
else {
|
2007-09-11 03:03:25 +00:00
|
|
|
msg = "storing head";
|
2007-11-03 05:32:48 +00:00
|
|
|
what = "[new branch]";
|
|
|
|
}
|
|
|
|
|
2008-06-27 03:59:50 +00:00
|
|
|
r = s_update_ref(msg, ref, 0);
|
|
|
|
sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*',
|
|
|
|
SUMMARY_WIDTH, what, REFCOL_WIDTH, remote, pretty_ref,
|
|
|
|
r ? " (unable to update local ref)" : "");
|
|
|
|
return r;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (in_merge_bases(current, &updated, 1)) {
|
2007-11-03 05:32:48 +00:00
|
|
|
char quickref[83];
|
2008-06-27 03:59:50 +00:00
|
|
|
int r;
|
2007-11-03 05:32:48 +00:00
|
|
|
strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
|
|
|
|
strcat(quickref, "..");
|
|
|
|
strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
|
2008-06-27 03:59:50 +00:00
|
|
|
r = s_update_ref("fast forward", ref, 1);
|
|
|
|
sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ',
|
|
|
|
SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
|
|
|
|
pretty_ref, r ? " (unable to update local ref)" : "");
|
|
|
|
return r;
|
2007-11-03 05:32:48 +00:00
|
|
|
} else if (force || ref->force) {
|
|
|
|
char quickref[84];
|
2008-06-27 03:59:50 +00:00
|
|
|
int r;
|
2007-11-03 05:32:48 +00:00
|
|
|
strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
|
|
|
|
strcat(quickref, "...");
|
|
|
|
strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
|
2008-06-27 03:59:50 +00:00
|
|
|
r = s_update_ref("forced-update", ref, 1);
|
|
|
|
sprintf(display, "%c %-*s %-*s -> %s (%s)", r ? '!' : '+',
|
|
|
|
SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
|
|
|
|
pretty_ref,
|
|
|
|
r ? "unable to update local ref" : "forced update");
|
|
|
|
return r;
|
2007-11-03 05:32:48 +00:00
|
|
|
} else {
|
2007-11-04 23:05:45 +00:00
|
|
|
sprintf(display, "! %-*s %-*s -> %s (non fast forward)",
|
|
|
|
SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
|
|
|
|
pretty_ref);
|
2007-09-11 03:03:25 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-17 08:20:11 +00:00
|
|
|
static int store_updated_refs(const char *raw_url, const char *remote_name,
|
2008-06-27 04:01:41 +00:00
|
|
|
struct ref *ref_map)
|
2007-09-11 03:03:25 +00:00
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
struct commit *commit;
|
2008-05-28 15:29:36 +00:00
|
|
|
int url_len, i, note_len, shown_url = 0, rc = 0;
|
2007-09-11 03:03:25 +00:00
|
|
|
char note[1024];
|
|
|
|
const char *what, *kind;
|
|
|
|
struct ref *rm;
|
2009-04-17 08:20:11 +00:00
|
|
|
char *url, *filename = git_path("FETCH_HEAD");
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-11-22 22:22:23 +00:00
|
|
|
fp = fopen(filename, "a");
|
|
|
|
if (!fp)
|
|
|
|
return error("cannot open %s: %s\n", filename, strerror(errno));
|
2009-04-17 08:20:11 +00:00
|
|
|
|
|
|
|
url = transport_anonymize_url(raw_url);
|
2007-09-11 03:03:25 +00:00
|
|
|
for (rm = ref_map; rm; rm = rm->next) {
|
|
|
|
struct ref *ref = NULL;
|
|
|
|
|
|
|
|
if (rm->peer_ref) {
|
|
|
|
ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
|
|
|
|
strcpy(ref->name, rm->peer_ref->name);
|
|
|
|
hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
|
|
|
|
hashcpy(ref->new_sha1, rm->old_sha1);
|
2007-09-14 07:31:07 +00:00
|
|
|
ref->force = rm->peer_ref->force;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
|
2007-10-19 04:54:59 +00:00
|
|
|
commit = lookup_commit_reference_gently(rm->old_sha1, 1);
|
2007-09-11 03:03:25 +00:00
|
|
|
if (!commit)
|
|
|
|
rm->merge = 0;
|
|
|
|
|
|
|
|
if (!strcmp(rm->name, "HEAD")) {
|
|
|
|
kind = "";
|
|
|
|
what = "";
|
|
|
|
}
|
|
|
|
else if (!prefixcmp(rm->name, "refs/heads/")) {
|
|
|
|
kind = "branch";
|
|
|
|
what = rm->name + 11;
|
|
|
|
}
|
|
|
|
else if (!prefixcmp(rm->name, "refs/tags/")) {
|
|
|
|
kind = "tag";
|
|
|
|
what = rm->name + 10;
|
|
|
|
}
|
|
|
|
else if (!prefixcmp(rm->name, "refs/remotes/")) {
|
|
|
|
kind = "remote branch";
|
|
|
|
what = rm->name + 13;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
kind = "";
|
|
|
|
what = rm->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
url_len = strlen(url);
|
|
|
|
for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
|
|
|
|
;
|
|
|
|
url_len = i + 1;
|
|
|
|
if (4 < i && !strncmp(".git", url + i - 3, 4))
|
|
|
|
url_len = i - 3;
|
|
|
|
|
|
|
|
note_len = 0;
|
|
|
|
if (*what) {
|
|
|
|
if (*kind)
|
|
|
|
note_len += sprintf(note + note_len, "%s ",
|
|
|
|
kind);
|
|
|
|
note_len += sprintf(note + note_len, "'%s' of ", what);
|
|
|
|
}
|
2009-05-13 18:08:53 +00:00
|
|
|
note[note_len] = '\0';
|
|
|
|
fprintf(fp, "%s\t%s\t%s",
|
2007-09-11 03:03:25 +00:00
|
|
|
sha1_to_hex(commit ? commit->object.sha1 :
|
|
|
|
rm->old_sha1),
|
|
|
|
rm->merge ? "" : "not-for-merge",
|
|
|
|
note);
|
2009-05-13 18:08:53 +00:00
|
|
|
for (i = 0; i < url_len; ++i)
|
|
|
|
if ('\n' == url[i])
|
|
|
|
fputs("\\n", fp);
|
|
|
|
else
|
|
|
|
fputc(url[i], fp);
|
|
|
|
fputc('\n', fp);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2008-04-10 00:03:49 +00:00
|
|
|
if (ref)
|
2008-11-15 00:14:24 +00:00
|
|
|
rc |= update_local_ref(ref, what, note);
|
2008-04-10 00:11:52 +00:00
|
|
|
else
|
2008-04-10 00:03:49 +00:00
|
|
|
sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
|
|
|
|
SUMMARY_WIDTH, *kind ? kind : "branch",
|
|
|
|
REFCOL_WIDTH, *what ? what : "HEAD");
|
|
|
|
if (*note) {
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity >= 0 && !shown_url) {
|
2008-04-10 00:03:49 +00:00
|
|
|
fprintf(stderr, "From %.*s\n",
|
|
|
|
url_len, url);
|
|
|
|
shown_url = 1;
|
2007-11-03 05:32:48 +00:00
|
|
|
}
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity >= 0)
|
|
|
|
fprintf(stderr, " %s\n", note);
|
2007-11-03 05:32:48 +00:00
|
|
|
}
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
2009-04-17 08:20:11 +00:00
|
|
|
free(url);
|
2007-09-11 03:03:25 +00:00
|
|
|
fclose(fp);
|
2008-06-27 04:01:41 +00:00
|
|
|
if (rc & 2)
|
|
|
|
error("some local refs could not be updated; try running\n"
|
|
|
|
" 'git remote prune %s' to remove any old, conflicting "
|
|
|
|
"branches", remote_name);
|
2008-05-28 15:29:36 +00:00
|
|
|
return rc;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
|
2007-11-11 07:29:47 +00:00
|
|
|
/*
|
|
|
|
* We would want to bypass the object transfer altogether if
|
|
|
|
* everything we are going to fetch already exists and connected
|
|
|
|
* locally.
|
|
|
|
*
|
|
|
|
* The refs we are going to fetch are in to_fetch (nr_heads in
|
|
|
|
* total). If running
|
|
|
|
*
|
2008-09-09 10:28:30 +00:00
|
|
|
* $ git rev-list --objects to_fetch[0] to_fetch[1] ... --not --all
|
2007-11-11 07:29:47 +00:00
|
|
|
*
|
|
|
|
* does not error out, that means everything reachable from the
|
|
|
|
* refs we are going to fetch exists and is connected to some of
|
|
|
|
* our existing refs.
|
|
|
|
*/
|
|
|
|
static int quickfetch(struct ref *ref_map)
|
|
|
|
{
|
|
|
|
struct child_process revlist;
|
|
|
|
struct ref *ref;
|
|
|
|
char **argv;
|
|
|
|
int i, err;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we are deepening a shallow clone we already have these
|
|
|
|
* objects reachable. Running rev-list here will return with
|
|
|
|
* a good (0) exit status and we'll bypass the fetch that we
|
|
|
|
* really need to perform. Claiming failure now will ensure
|
|
|
|
* we perform the network exchange to deepen our history.
|
|
|
|
*/
|
|
|
|
if (depth)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
for (i = 0, ref = ref_map; ref; ref = ref->next)
|
|
|
|
i++;
|
|
|
|
if (!i)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
argv = xmalloc(sizeof(*argv) * (i + 6));
|
|
|
|
i = 0;
|
|
|
|
argv[i++] = xstrdup("rev-list");
|
|
|
|
argv[i++] = xstrdup("--quiet");
|
|
|
|
argv[i++] = xstrdup("--objects");
|
|
|
|
for (ref = ref_map; ref; ref = ref->next)
|
|
|
|
argv[i++] = xstrdup(sha1_to_hex(ref->old_sha1));
|
|
|
|
argv[i++] = xstrdup("--not");
|
|
|
|
argv[i++] = xstrdup("--all");
|
|
|
|
argv[i++] = NULL;
|
|
|
|
|
|
|
|
memset(&revlist, 0, sizeof(revlist));
|
|
|
|
revlist.argv = (const char**)argv;
|
|
|
|
revlist.git_cmd = 1;
|
|
|
|
revlist.no_stdin = 1;
|
|
|
|
revlist.no_stdout = 1;
|
|
|
|
revlist.no_stderr = 1;
|
|
|
|
err = run_command(&revlist);
|
|
|
|
|
|
|
|
for (i = 0; argv[i]; i++)
|
|
|
|
free(argv[i]);
|
|
|
|
free(argv);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2007-09-11 03:03:25 +00:00
|
|
|
static int fetch_refs(struct transport *transport, struct ref *ref_map)
|
|
|
|
{
|
2007-11-11 07:29:47 +00:00
|
|
|
int ret = quickfetch(ref_map);
|
|
|
|
if (ret)
|
|
|
|
ret = transport_fetch_refs(transport, ref_map);
|
2007-09-11 03:03:25 +00:00
|
|
|
if (!ret)
|
2008-06-27 04:01:41 +00:00
|
|
|
ret |= store_updated_refs(transport->url,
|
|
|
|
transport->remote->name,
|
|
|
|
ref_map);
|
2007-09-14 07:31:23 +00:00
|
|
|
transport_unlock_pack(transport);
|
2007-09-11 03:03:25 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int add_existing(const char *refname, const unsigned char *sha1,
|
|
|
|
int flag, void *cbdata)
|
|
|
|
{
|
2008-07-21 18:03:49 +00:00
|
|
|
struct string_list *list = (struct string_list *)cbdata;
|
|
|
|
string_list_insert(refname, list);
|
2007-09-11 03:03:25 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-03-03 02:35:33 +00:00
|
|
|
static int will_fetch(struct ref **head, const unsigned char *sha1)
|
|
|
|
{
|
|
|
|
struct ref *rm = *head;
|
|
|
|
while (rm) {
|
|
|
|
if (!hashcmp(rm->old_sha1, sha1))
|
|
|
|
return 1;
|
|
|
|
rm = rm->next;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-03-03 02:35:00 +00:00
|
|
|
static void find_non_local_tags(struct transport *transport,
|
|
|
|
struct ref **head,
|
|
|
|
struct ref ***tail)
|
2007-09-11 03:03:25 +00:00
|
|
|
{
|
2008-07-21 18:03:49 +00:00
|
|
|
struct string_list existing_refs = { NULL, 0, 0, 0 };
|
|
|
|
struct string_list new_refs = { NULL, 0, 0, 1 };
|
2007-09-11 03:03:25 +00:00
|
|
|
char *ref_name;
|
|
|
|
int ref_name_len;
|
2007-10-30 01:05:40 +00:00
|
|
|
const unsigned char *ref_sha1;
|
|
|
|
const struct ref *tag_ref;
|
2007-09-11 03:03:25 +00:00
|
|
|
struct ref *rm = NULL;
|
2007-10-30 01:05:40 +00:00
|
|
|
const struct ref *ref;
|
2007-09-11 03:03:25 +00:00
|
|
|
|
|
|
|
for_each_ref(add_existing, &existing_refs);
|
|
|
|
for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
|
|
|
|
if (prefixcmp(ref->name, "refs/tags"))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
ref_name = xstrdup(ref->name);
|
|
|
|
ref_name_len = strlen(ref_name);
|
|
|
|
ref_sha1 = ref->old_sha1;
|
|
|
|
|
|
|
|
if (!strcmp(ref_name + ref_name_len - 3, "^{}")) {
|
|
|
|
ref_name[ref_name_len - 3] = 0;
|
|
|
|
tag_ref = transport_get_remote_refs(transport);
|
|
|
|
while (tag_ref) {
|
|
|
|
if (!strcmp(tag_ref->name, ref_name)) {
|
|
|
|
ref_sha1 = tag_ref->old_sha1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tag_ref = tag_ref->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-21 18:03:49 +00:00
|
|
|
if (!string_list_has_string(&existing_refs, ref_name) &&
|
|
|
|
!string_list_has_string(&new_refs, ref_name) &&
|
2008-03-03 02:35:33 +00:00
|
|
|
(has_sha1_file(ref->old_sha1) ||
|
|
|
|
will_fetch(head, ref->old_sha1))) {
|
2008-07-21 18:03:49 +00:00
|
|
|
string_list_insert(ref_name, &new_refs);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2008-10-18 08:44:18 +00:00
|
|
|
rm = alloc_ref(ref_name);
|
|
|
|
rm->peer_ref = alloc_ref(ref_name);
|
2007-09-11 03:03:25 +00:00
|
|
|
hashcpy(rm->old_sha1, ref_sha1);
|
|
|
|
|
2008-03-03 02:35:00 +00:00
|
|
|
**tail = rm;
|
|
|
|
*tail = &rm->next;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
free(ref_name);
|
|
|
|
}
|
2008-07-21 18:03:49 +00:00
|
|
|
string_list_clear(&existing_refs, 0);
|
|
|
|
string_list_clear(&new_refs, 0);
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
|
2008-10-13 09:36:52 +00:00
|
|
|
static void check_not_current_branch(struct ref *ref_map)
|
|
|
|
{
|
|
|
|
struct branch *current_branch = branch_get(NULL);
|
|
|
|
|
|
|
|
if (is_bare_repository() || !current_branch)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (; ref_map; ref_map = ref_map->next)
|
|
|
|
if (ref_map->peer_ref && !strcmp(current_branch->refname,
|
|
|
|
ref_map->peer_ref->name))
|
2009-03-22 22:07:33 +00:00
|
|
|
die("Refusing to fetch into current branch %s "
|
|
|
|
"of non-bare repository", current_branch->refname);
|
2008-10-13 09:36:52 +00:00
|
|
|
}
|
|
|
|
|
2007-09-11 03:03:25 +00:00
|
|
|
static int do_fetch(struct transport *transport,
|
|
|
|
struct refspec *refs, int ref_count)
|
|
|
|
{
|
2008-03-03 02:34:43 +00:00
|
|
|
struct ref *ref_map;
|
2007-09-11 03:03:25 +00:00
|
|
|
struct ref *rm;
|
|
|
|
int autotags = (transport->remote->fetch_tags == 1);
|
2007-12-04 07:25:47 +00:00
|
|
|
if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)
|
|
|
|
tags = TAGS_SET;
|
2007-09-11 03:03:25 +00:00
|
|
|
if (transport->remote->fetch_tags == -1)
|
2007-12-04 07:25:47 +00:00
|
|
|
tags = TAGS_UNSET;
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-09-19 04:49:31 +00:00
|
|
|
if (!transport->get_refs_list || !transport->fetch)
|
2007-09-11 03:03:25 +00:00
|
|
|
die("Don't know how to fetch from %s", transport->url);
|
|
|
|
|
|
|
|
/* if not appending, truncate FETCH_HEAD */
|
2007-11-22 22:22:23 +00:00
|
|
|
if (!append) {
|
|
|
|
char *filename = git_path("FETCH_HEAD");
|
|
|
|
FILE *fp = fopen(filename, "w");
|
|
|
|
if (!fp)
|
|
|
|
return error("cannot open %s: %s\n", filename, strerror(errno));
|
|
|
|
fclose(fp);
|
|
|
|
}
|
2007-09-11 03:03:25 +00:00
|
|
|
|
|
|
|
ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
|
2008-10-13 09:36:52 +00:00
|
|
|
if (!update_head_ok)
|
|
|
|
check_not_current_branch(ref_map);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
|
|
|
for (rm = ref_map; rm; rm = rm->next) {
|
|
|
|
if (rm->peer_ref)
|
|
|
|
read_ref(rm->peer_ref->name, rm->peer_ref->old_sha1);
|
|
|
|
}
|
|
|
|
|
2008-03-04 03:27:40 +00:00
|
|
|
if (tags == TAGS_DEFAULT && autotags)
|
|
|
|
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
|
2007-09-11 03:03:25 +00:00
|
|
|
if (fetch_refs(transport, ref_map)) {
|
|
|
|
free_refs(ref_map);
|
|
|
|
return 1;
|
|
|
|
}
|
2008-03-03 02:34:43 +00:00
|
|
|
free_refs(ref_map);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
|
|
|
/* if neither --no-tags nor --tags was specified, do automated tag
|
|
|
|
* following ... */
|
2007-12-04 07:25:47 +00:00
|
|
|
if (tags == TAGS_DEFAULT && autotags) {
|
2008-03-03 02:35:00 +00:00
|
|
|
struct ref **tail = &ref_map;
|
|
|
|
ref_map = NULL;
|
|
|
|
find_non_local_tags(transport, &ref_map, &tail);
|
2007-09-11 03:03:25 +00:00
|
|
|
if (ref_map) {
|
2008-03-04 03:27:40 +00:00
|
|
|
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
|
2007-09-11 03:03:25 +00:00
|
|
|
transport_set_option(transport, TRANS_OPT_DEPTH, "0");
|
|
|
|
fetch_refs(transport, ref_map);
|
|
|
|
}
|
|
|
|
free_refs(ref_map);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-09-18 08:54:57 +00:00
|
|
|
static void set_option(const char *name, const char *value)
|
|
|
|
{
|
|
|
|
int r = transport_set_option(transport, name, value);
|
|
|
|
if (r < 0)
|
2009-01-04 18:38:41 +00:00
|
|
|
die("Option \"%s\" value \"%s\" is not valid for %s",
|
2007-09-18 08:54:57 +00:00
|
|
|
name, value, transport->url);
|
|
|
|
if (r > 0)
|
|
|
|
warning("Option \"%s\" is ignored for %s\n",
|
|
|
|
name, transport->url);
|
|
|
|
}
|
|
|
|
|
2007-09-11 03:03:25 +00:00
|
|
|
int cmd_fetch(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
struct remote *remote;
|
2007-12-04 07:25:46 +00:00
|
|
|
int i;
|
2007-09-11 03:03:25 +00:00
|
|
|
static const char **refs = NULL;
|
|
|
|
int ref_nr = 0;
|
2008-04-28 20:23:35 +00:00
|
|
|
int exit_code;
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-12-04 07:25:46 +00:00
|
|
|
/* Record the command line for the reflog */
|
|
|
|
strbuf_addstr(&default_rla, "fetch");
|
|
|
|
for (i = 1; i < argc; i++)
|
|
|
|
strbuf_addf(&default_rla, " %s", argv[i]);
|
|
|
|
|
2007-12-04 07:25:47 +00:00
|
|
|
argc = parse_options(argc, argv,
|
|
|
|
builtin_fetch_options, builtin_fetch_usage, 0);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-12-04 07:25:47 +00:00
|
|
|
if (argc == 0)
|
2007-09-11 03:03:25 +00:00
|
|
|
remote = remote_get(NULL);
|
|
|
|
else
|
2007-12-04 07:25:47 +00:00
|
|
|
remote = remote_get(argv[0]);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
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 05:47:20 +00:00
|
|
|
if (!remote)
|
|
|
|
die("Where do you want to fetch from today?");
|
|
|
|
|
2007-09-19 04:49:27 +00:00
|
|
|
transport = transport_get(remote, remote->url[0]);
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity >= 2)
|
2007-09-11 03:03:25 +00:00
|
|
|
transport->verbose = 1;
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity < 0)
|
2007-10-03 02:49:15 +00:00
|
|
|
transport->verbose = -1;
|
2007-09-11 03:03:25 +00:00
|
|
|
if (upload_pack)
|
2007-09-18 08:54:57 +00:00
|
|
|
set_option(TRANS_OPT_UPLOADPACK, upload_pack);
|
2007-09-11 03:03:25 +00:00
|
|
|
if (keep)
|
2007-09-18 08:54:57 +00:00
|
|
|
set_option(TRANS_OPT_KEEP, "yes");
|
|
|
|
if (depth)
|
|
|
|
set_option(TRANS_OPT_DEPTH, depth);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-12-04 07:25:47 +00:00
|
|
|
if (argc > 1) {
|
2007-09-11 03:03:25 +00:00
|
|
|
int j = 0;
|
2007-12-04 07:25:47 +00:00
|
|
|
refs = xcalloc(argc + 1, sizeof(const char *));
|
|
|
|
for (i = 1; i < argc; i++) {
|
2007-09-11 03:03:25 +00:00
|
|
|
if (!strcmp(argv[i], "tag")) {
|
|
|
|
char *ref;
|
|
|
|
i++;
|
2008-04-05 18:28:53 +00:00
|
|
|
if (i >= argc)
|
|
|
|
die("You need to specify a tag name.");
|
2007-09-11 03:03:25 +00:00
|
|
|
ref = xmalloc(strlen(argv[i]) * 2 + 22);
|
|
|
|
strcpy(ref, "refs/tags/");
|
|
|
|
strcat(ref, argv[i]);
|
|
|
|
strcat(ref, ":refs/tags/");
|
|
|
|
strcat(ref, argv[i]);
|
|
|
|
refs[j++] = ref;
|
|
|
|
} else
|
|
|
|
refs[j++] = argv[i];
|
|
|
|
}
|
|
|
|
refs[j] = NULL;
|
|
|
|
ref_nr = j;
|
|
|
|
}
|
|
|
|
|
2009-01-22 06:03:08 +00:00
|
|
|
sigchain_push_common(unlock_pack_on_signal);
|
2007-09-14 07:31:25 +00:00
|
|
|
atexit(unlock_pack);
|
2008-04-28 20:23:35 +00:00
|
|
|
exit_code = do_fetch(transport,
|
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 06:34:37 +00:00
|
|
|
parse_fetch_refspec(ref_nr, refs), ref_nr);
|
2008-04-28 20:23:35 +00:00
|
|
|
transport_disconnect(transport);
|
|
|
|
transport = NULL;
|
|
|
|
return exit_code;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|