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"
|
2010-02-16 23:42:52 +00:00
|
|
|
#include "transport.h"
|
2010-11-12 12:54:52 +00:00
|
|
|
#include "submodule.h"
|
2011-09-02 23:33:22 +00:00
|
|
|
#include "connected.h"
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2007-12-04 07:25:47 +00:00
|
|
|
static const char * const builtin_fetch_usage[] = {
|
2010-04-10 02:50:19 +00:00
|
|
|
"git fetch [<options>] [<repository> [<refspec>...]]",
|
|
|
|
"git fetch [<options>] <group>",
|
2010-10-08 17:31:17 +00:00
|
|
|
"git fetch --multiple [<options>] [(<repository> | <group>)...]",
|
2010-04-10 02:50:19 +00:00
|
|
|
"git fetch --all [<options>]",
|
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
|
|
|
|
};
|
|
|
|
|
2009-11-10 08:19:43 +00:00
|
|
|
static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity;
|
2010-11-10 23:55:02 +00:00
|
|
|
static int progress, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
|
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;
|
2010-11-12 12:54:52 +00:00
|
|
|
static const char *submodule_prefix = "";
|
2011-03-06 22:10:46 +00:00
|
|
|
static const char *recurse_submodules_default;
|
2007-09-14 07:31:25 +00:00
|
|
|
|
2011-03-06 22:11:21 +00:00
|
|
|
static int option_parse_recurse_submodules(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
if (unset) {
|
|
|
|
recurse_submodules = RECURSE_SUBMODULES_OFF;
|
|
|
|
} else {
|
|
|
|
if (arg)
|
|
|
|
recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
|
|
|
|
else
|
|
|
|
recurse_submodules = RECURSE_SUBMODULES_ON;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2007-09-14 07:31:25 +00:00
|
|
|
|
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),
|
2009-11-09 20:09:56 +00:00
|
|
|
OPT_BOOLEAN(0, "all", &all,
|
|
|
|
"fetch from all remotes"),
|
2007-12-04 07:25:47 +00:00
|
|
|
OPT_BOOLEAN('a', "append", &append,
|
|
|
|
"append to .git/FETCH_HEAD instead of overwriting"),
|
2011-02-15 13:09:12 +00:00
|
|
|
OPT_STRING(0, "upload-pack", &upload_pack, "path",
|
2007-12-04 07:25:47 +00:00
|
|
|
"path to upload pack on remote end"),
|
2010-11-08 18:01:54 +00:00
|
|
|
OPT__FORCE(&force, "force overwrite of local branch"),
|
2009-11-09 20:10:32 +00:00
|
|
|
OPT_BOOLEAN('m', "multiple", &multiple,
|
|
|
|
"fetch from multiple remotes"),
|
2007-12-04 07:25:47 +00:00
|
|
|
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),
|
2009-11-10 08:15:47 +00:00
|
|
|
OPT_BOOLEAN('p', "prune", &prune,
|
2010-11-02 15:31:23 +00:00
|
|
|
"prune remote-tracking branches no longer on remote"),
|
2011-03-06 22:11:21 +00:00
|
|
|
{ OPTION_CALLBACK, 0, "recurse-submodules", NULL, "on-demand",
|
2010-11-10 23:55:02 +00:00
|
|
|
"control recursive fetching of submodules",
|
2011-03-06 22:11:21 +00:00
|
|
|
PARSE_OPT_OPTARG, option_parse_recurse_submodules },
|
2009-11-10 08:19:43 +00:00
|
|
|
OPT_BOOLEAN(0, "dry-run", &dry_run,
|
|
|
|
"dry run"),
|
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"),
|
2010-02-24 12:50:28 +00:00
|
|
|
OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
|
2011-02-15 13:09:12 +00:00
|
|
|
OPT_STRING(0, "depth", &depth, "depth",
|
2007-12-04 07:25:47 +00:00
|
|
|
"deepen history of shallow clone"),
|
2011-02-15 13:09:12 +00:00
|
|
|
{ OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, "dir",
|
2010-11-12 12:54:52 +00:00
|
|
|
"prepend this to submodule path output", PARSE_OPT_HIDDEN },
|
2011-03-06 22:10:46 +00:00
|
|
|
{ OPTION_STRING, 0, "recurse-submodules-default",
|
|
|
|
&recurse_submodules_default, NULL,
|
|
|
|
"default mode for recursion", PARSE_OPT_HIDDEN },
|
2007-12-04 07:25:47 +00:00
|
|
|
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
|
|
|
/*
|
2010-11-02 15:31:23 +00:00
|
|
|
* Not fetched to a remote-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
|
|
|
*/
|
2010-03-12 22:27:33 +00:00
|
|
|
memset(&refspec, 0, sizeof(refspec));
|
2007-09-18 08:54:53 +00:00
|
|
|
refspec.src = branch->merge[i]->src;
|
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);
|
builtin/fetch.c: ignore merge config when not fetching from branch's remote
When 'git fetch' is supplied a single argument, it tries to match it
against a configured remote and then fetch the refs specified by the
named remote's fetchspec. Additionally, or alternatively, if the current
branch has a merge ref configured, and if the name of the remote supplied
to fetch matches the one in the branch's configuration, then git also adds
the merge ref to the list of refs to update.
If the argument to fetch does not specify a named remote, or if the name
supplied does not match the remote configured for the current branch, then
the current branch's merge configuration should not be considered.
git currently mishandles the case when the argument to fetch specifies a
GIT URL(i.e. not a named remote) and the current branch has a configured
merge ref. In this case, fetch should ignore the branch's merge ref and
attempt to fetch from the remote repository's HEAD branch. But, since
fetch only checks _whether_ the current branch has a merge ref configured,
and does _not_ check whether the branch's configured remote matches the
command line argument (until later), it will mistakenly enter the wrong
branch of an 'if' statement and will not fall back to fetch the HEAD branch.
The fetch ends up doing nothing and returns with a successful zero status.
Fix this by comparing the remote repository's name to the branch's remote
name, in addition to whether it has a configured merge ref, sooner, so that
fetch can correctly decide whether the branch's configuration is interesting
or not, and fall back to fetching from the remote's HEAD branch when
appropriate.
This fixes the test in t5510.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-25 17:52:56 +00:00
|
|
|
if (remote &&
|
|
|
|
(remote->fetch_refspec_nr ||
|
2010-09-09 18:56:36 +00:00
|
|
|
/* Note: has_merge implies non-NULL branch->remote_name */
|
builtin/fetch.c: ignore merge config when not fetching from branch's remote
When 'git fetch' is supplied a single argument, it tries to match it
against a configured remote and then fetch the refs specified by the
named remote's fetchspec. Additionally, or alternatively, if the current
branch has a merge ref configured, and if the name of the remote supplied
to fetch matches the one in the branch's configuration, then git also adds
the merge ref to the list of refs to update.
If the argument to fetch does not specify a named remote, or if the name
supplied does not match the remote configured for the current branch, then
the current branch's merge configuration should not be considered.
git currently mishandles the case when the argument to fetch specifies a
GIT URL(i.e. not a named remote) and the current branch has a configured
merge ref. In this case, fetch should ignore the branch's merge ref and
attempt to fetch from the remote repository's HEAD branch. But, since
fetch only checks _whether_ the current branch has a merge ref configured,
and does _not_ check whether the branch's configured remote matches the
command line argument (until later), it will mistakenly enter the wrong
branch of an 'if' statement and will not fall back to fetch the HEAD branch.
The fetch ends up doing nothing and returns with a successful zero status.
Fix this by comparing the remote repository's name to the branch's remote
name, in addition to whether it has a configured merge ref, sooner, so that
fetch can correctly decide whether the branch's configuration is interesting
or not, and fall back to fetching from the remote's HEAD branch when
appropriate.
This fixes the test in t5510.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-25 17:52:56 +00:00
|
|
|
(has_merge && !strcmp(branch->remote_name, remote->name)))) {
|
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.
|
2010-09-09 18:56:36 +00:00
|
|
|
*
|
|
|
|
* Note: has_merge implies non-NULL branch->remote_name
|
2007-10-11 00:47:55 +00:00
|
|
|
*/
|
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)
|
2011-02-22 23:41:51 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2009-05-25 10:40:54 +00:00
|
|
|
#define STORE_REF_ERROR_OTHER 1
|
|
|
|
#define STORE_REF_ERROR_DF_CONFLICT 2
|
|
|
|
|
2007-09-11 03:03:25 +00:00
|
|
|
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;
|
|
|
|
|
2009-11-10 08:19:43 +00:00
|
|
|
if (dry_run)
|
|
|
|
return 0;
|
2007-09-11 03:03:25 +00:00
|
|
|
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)
|
2009-05-25 10:40:54 +00:00
|
|
|
return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
|
|
|
|
STORE_REF_ERROR_OTHER;
|
2007-09-11 03:03:25 +00:00
|
|
|
if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
|
2009-05-25 10:40:54 +00:00
|
|
|
return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
|
|
|
|
STORE_REF_ERROR_OTHER;
|
2007-09-11 03:03:25 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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)
|
2011-02-22 23:41:51 +00:00
|
|
|
die(_("object %s not found"), sha1_to_hex(ref->new_sha1));
|
2007-09-11 03:03:25 +00:00
|
|
|
|
|
|
|
if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity > 0)
|
2010-02-16 23:42:52 +00:00
|
|
|
sprintf(display, "= %-*s %-*s -> %s", TRANSPORT_SUMMARY_WIDTH,
|
2011-02-22 23:41:52 +00:00
|
|
|
_("[up to date]"), REFCOL_WIDTH, remote,
|
2007-11-04 23:05:45 +00:00
|
|
|
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...
|
|
|
|
*/
|
2011-02-22 23:41:52 +00:00
|
|
|
sprintf(display, _("! %-*s %-*s -> %s (can't fetch in current branch)"),
|
|
|
|
TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
|
2007-11-04 23:05:45 +00:00
|
|
|
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 ? '!' : '-',
|
2011-02-22 23:41:52 +00:00
|
|
|
TRANSPORT_SUMMARY_WIDTH, _("[tag update]"), REFCOL_WIDTH, remote,
|
|
|
|
pretty_ref, r ? _(" (unable to update local ref)") : "");
|
2008-06-27 03:59:50 +00:00
|
|
|
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";
|
2011-02-22 23:41:53 +00:00
|
|
|
what = _("[new tag]");
|
2007-11-03 05:32:48 +00:00
|
|
|
}
|
|
|
|
else {
|
2007-09-11 03:03:25 +00:00
|
|
|
msg = "storing head";
|
2011-02-22 23:41:53 +00:00
|
|
|
what = _("[new branch]");
|
2011-03-06 22:10:46 +00:00
|
|
|
if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
|
|
|
|
(recurse_submodules != RECURSE_SUBMODULES_ON))
|
|
|
|
check_for_new_submodule_commits(ref->new_sha1);
|
2007-11-03 05:32:48 +00:00
|
|
|
}
|
|
|
|
|
2008-06-27 03:59:50 +00:00
|
|
|
r = s_update_ref(msg, ref, 0);
|
|
|
|
sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*',
|
2010-02-16 23:42:52 +00:00
|
|
|
TRANSPORT_SUMMARY_WIDTH, what, REFCOL_WIDTH, remote, pretty_ref,
|
2011-02-22 23:41:53 +00:00
|
|
|
r ? _(" (unable to update local ref)") : "");
|
2008-06-27 03:59:50 +00:00
|
|
|
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));
|
2011-03-06 22:10:46 +00:00
|
|
|
if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
|
|
|
|
(recurse_submodules != RECURSE_SUBMODULES_ON))
|
|
|
|
check_for_new_submodule_commits(ref->new_sha1);
|
2009-10-24 08:31:32 +00:00
|
|
|
r = s_update_ref("fast-forward", ref, 1);
|
2008-06-27 03:59:50 +00:00
|
|
|
sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : ' ',
|
2010-02-16 23:42:52 +00:00
|
|
|
TRANSPORT_SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
|
2011-02-22 23:41:53 +00:00
|
|
|
pretty_ref, r ? _(" (unable to update local ref)") : "");
|
2008-06-27 03:59:50 +00:00
|
|
|
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));
|
2011-03-06 22:10:46 +00:00
|
|
|
if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
|
|
|
|
(recurse_submodules != RECURSE_SUBMODULES_ON))
|
|
|
|
check_for_new_submodule_commits(ref->new_sha1);
|
2008-06-27 03:59:50 +00:00
|
|
|
r = s_update_ref("forced-update", ref, 1);
|
|
|
|
sprintf(display, "%c %-*s %-*s -> %s (%s)", r ? '!' : '+',
|
2010-02-16 23:42:52 +00:00
|
|
|
TRANSPORT_SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
|
2008-06-27 03:59:50 +00:00
|
|
|
pretty_ref,
|
2011-02-22 23:41:53 +00:00
|
|
|
r ? _("unable to update local ref") : _("forced update"));
|
2008-06-27 03:59:50 +00:00
|
|
|
return r;
|
2007-11-03 05:32:48 +00:00
|
|
|
} else {
|
2011-02-22 23:41:54 +00:00
|
|
|
sprintf(display, "! %-*s %-*s -> %s %s",
|
|
|
|
TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
|
|
|
|
pretty_ref, _("(non-fast-forward)"));
|
2007-09-11 03:03:25 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-02 23:22:47 +00:00
|
|
|
static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
|
2011-09-01 22:43:35 +00:00
|
|
|
{
|
2011-09-02 23:22:47 +00:00
|
|
|
struct ref **rm = cb_data;
|
|
|
|
struct ref *ref = *rm;
|
2011-09-01 22:43:35 +00:00
|
|
|
|
2011-09-02 23:22:47 +00:00
|
|
|
if (!ref)
|
|
|
|
return -1; /* end of the list */
|
|
|
|
*rm = ref->next;
|
|
|
|
hashcpy(sha1, ref->old_sha1);
|
|
|
|
return 0;
|
2011-09-01 22:43:35 +00:00
|
|
|
}
|
|
|
|
|
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-11-10 08:19:43 +00:00
|
|
|
char *url, *filename = dry_run ? "/dev/null" : 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)
|
2011-02-22 23:41:51 +00:00
|
|
|
return error(_("cannot open %s: %s\n"), filename, strerror(errno));
|
2009-04-17 08:20:11 +00:00
|
|
|
|
2009-11-18 01:42:22 +00:00
|
|
|
if (raw_url)
|
|
|
|
url = transport_anonymize_url(raw_url);
|
|
|
|
else
|
|
|
|
url = xstrdup("foreign");
|
2011-09-01 22:43:35 +00:00
|
|
|
|
2011-09-02 23:22:47 +00:00
|
|
|
rm = ref_map;
|
2011-10-18 04:37:12 +00:00
|
|
|
if (check_everything_connected(iterate_ref_map, 0, &rm)) {
|
2011-10-07 07:40:22 +00:00
|
|
|
rc = error(_("%s did not send all necessary objects\n"), url);
|
|
|
|
goto abort;
|
|
|
|
}
|
2011-09-01 22:43:35 +00:00
|
|
|
|
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/")) {
|
2010-11-02 15:31:25 +00:00
|
|
|
kind = "remote-tracking branch";
|
2007-09-11 03:03:25 +00:00
|
|
|
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
|
|
|
|
2010-03-15 22:18:48 +00:00
|
|
|
if (ref) {
|
2008-11-15 00:14:24 +00:00
|
|
|
rc |= update_local_ref(ref, what, note);
|
2010-03-15 22:18:48 +00:00
|
|
|
free(ref);
|
|
|
|
} else
|
2008-04-10 00:03:49 +00:00
|
|
|
sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
|
2010-02-16 23:42:52 +00:00
|
|
|
TRANSPORT_SUMMARY_WIDTH, *kind ? kind : "branch",
|
2008-04-10 00:03:49 +00:00
|
|
|
REFCOL_WIDTH, *what ? what : "HEAD");
|
|
|
|
if (*note) {
|
2008-11-15 00:14:24 +00:00
|
|
|
if (verbosity >= 0 && !shown_url) {
|
2011-02-22 23:41:52 +00:00
|
|
|
fprintf(stderr, _("From %.*s\n"),
|
2008-04-10 00:03:49 +00:00
|
|
|
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
|
|
|
}
|
2011-10-07 07:40:22 +00:00
|
|
|
|
2009-05-25 10:40:54 +00:00
|
|
|
if (rc & STORE_REF_ERROR_DF_CONFLICT)
|
2011-02-22 23:41:51 +00:00
|
|
|
error(_("some local refs could not be updated; try running\n"
|
2008-06-27 04:01:41 +00:00
|
|
|
" 'git remote prune %s' to remove any old, conflicting "
|
2011-02-22 23:41:51 +00:00
|
|
|
"branches"), remote_name);
|
2011-10-07 07:40:22 +00:00
|
|
|
|
|
|
|
abort:
|
|
|
|
free(url);
|
|
|
|
fclose(fp);
|
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
|
quickfetch(): Prevent overflow of the rev-list command line
quickfetch() calls rev-list to check whether the objects we are about to
fetch are already present in the repo (if so, we can skip the object fetch).
However, when there are many (~1000) refs to be fetched, the rev-list
command line grows larger than the maximum command line size on some systems
(32K in Windows). This causes rev-list to fail, making quickfetch() return
non-zero, which unnecessarily triggers the transport machinery. This somehow
causes fetch to fail with an exit code.
By using the --stdin option to rev-list (and feeding the object list to its
standard input), we prevent the overflow of the rev-list command line,
which causes quickfetch(), and subsequently the overall fetch, to succeed.
However, using rev-list --stdin is not entirely straightforward: rev-list
terminates immediately when encountering an unknown object, which can
trigger SIGPIPE if we are still writing object's to its standard input.
We therefore temporarily ignore SIGPIPE so that the fetch process is not
terminated.
The patch also contains a testcase to verify the fix (note that before
the patch, the testcase would only fail on msysGit).
Signed-off-by: Johan Herland <johan@herland.net>
Improved-by: Johannes Sixt <j6t@kdbg.org>
Improved-by: Alex Riesen <raa.lkml@gmail.com>
Tested-by: Peter Krefting <peter@softwolves.pp.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-09 23:52:30 +00:00
|
|
|
* everything we are going to fetch already exists and is connected
|
2007-11-11 07:29:47 +00:00
|
|
|
* locally.
|
|
|
|
*/
|
|
|
|
static int quickfetch(struct ref *ref_map)
|
|
|
|
{
|
2011-09-02 23:22:47 +00:00
|
|
|
struct ref *rm = ref_map;
|
|
|
|
|
2007-11-11 07:29:47 +00:00
|
|
|
/*
|
|
|
|
* 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;
|
2011-09-02 23:22:47 +00:00
|
|
|
return check_everything_connected(iterate_ref_map, 1, &rm);
|
2007-11-11 07:29:47 +00:00
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2011-10-15 05:04:25 +00:00
|
|
|
static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map)
|
2009-11-10 08:15:47 +00:00
|
|
|
{
|
|
|
|
int result = 0;
|
2011-10-15 05:04:25 +00:00
|
|
|
struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
|
2009-11-10 08:15:47 +00:00
|
|
|
const char *dangling_msg = dry_run
|
2011-02-22 23:41:52 +00:00
|
|
|
? _(" (%s will become dangling)\n")
|
|
|
|
: _(" (%s has become dangling)\n");
|
2009-11-10 08:15:47 +00:00
|
|
|
|
|
|
|
for (ref = stale_refs; ref; ref = ref->next) {
|
|
|
|
if (!dry_run)
|
|
|
|
result |= delete_ref(ref->name, NULL, 0);
|
|
|
|
if (verbosity >= 0) {
|
|
|
|
fprintf(stderr, " x %-*s %-*s -> %s\n",
|
2011-02-22 23:41:52 +00:00
|
|
|
TRANSPORT_SUMMARY_WIDTH, _("[deleted]"),
|
|
|
|
REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name));
|
2009-11-10 08:15:47 +00:00
|
|
|
warn_dangling_symref(stderr, dangling_msg, ref->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free_refs(stale_refs);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-09-11 03:03:25 +00:00
|
|
|
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;
|
2010-06-25 23:41:35 +00:00
|
|
|
struct string_list_item *item = string_list_insert(list, refname);
|
2009-10-25 21:28:12 +00:00
|
|
|
item->util = (void *)sha1;
|
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
|
|
|
{
|
2010-07-04 19:46:19 +00:00
|
|
|
struct string_list existing_refs = STRING_LIST_INIT_NODUP;
|
|
|
|
struct string_list remote_refs = STRING_LIST_INIT_NODUP;
|
2007-10-30 01:05:40 +00:00
|
|
|
const struct ref *ref;
|
2009-09-17 07:33:19 +00:00
|
|
|
struct string_list_item *item = NULL;
|
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;
|
|
|
|
|
2009-09-17 07:33:19 +00:00
|
|
|
/*
|
|
|
|
* The peeled ref always follows the matching base
|
|
|
|
* ref, so if we see a peeled ref that we don't want
|
|
|
|
* to fetch then we can mark the ref entry in the list
|
|
|
|
* as one to ignore by setting util to NULL.
|
|
|
|
*/
|
2010-03-13 17:17:04 +00:00
|
|
|
if (!suffixcmp(ref->name, "^{}")) {
|
2009-09-17 07:33:19 +00:00
|
|
|
if (item && !has_sha1_file(ref->old_sha1) &&
|
|
|
|
!will_fetch(head, ref->old_sha1) &&
|
|
|
|
!has_sha1_file(item->util) &&
|
|
|
|
!will_fetch(head, item->util))
|
|
|
|
item->util = NULL;
|
|
|
|
item = NULL;
|
|
|
|
continue;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
|
2009-09-17 07:33:19 +00:00
|
|
|
/*
|
|
|
|
* If item is non-NULL here, then we previously saw a
|
|
|
|
* ref not followed by a peeled reference, so we need
|
|
|
|
* to check if it is a lightweight tag that we want to
|
|
|
|
* fetch.
|
|
|
|
*/
|
|
|
|
if (item && !has_sha1_file(item->util) &&
|
|
|
|
!will_fetch(head, item->util))
|
|
|
|
item->util = NULL;
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2009-09-17 07:33:19 +00:00
|
|
|
item = NULL;
|
2007-09-11 03:03:25 +00:00
|
|
|
|
2009-09-17 07:33:19 +00:00
|
|
|
/* skip duplicates and refs that we already have */
|
|
|
|
if (string_list_has_string(&remote_refs, ref->name) ||
|
|
|
|
string_list_has_string(&existing_refs, ref->name))
|
|
|
|
continue;
|
|
|
|
|
2010-06-25 23:41:35 +00:00
|
|
|
item = string_list_insert(&remote_refs, ref->name);
|
2009-09-17 07:33:19 +00:00
|
|
|
item->util = (void *)ref->old_sha1;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
2008-07-21 18:03:49 +00:00
|
|
|
string_list_clear(&existing_refs, 0);
|
2009-09-17 07:33:19 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We may have a final lightweight tag that needs to be
|
|
|
|
* checked to see if it needs fetching.
|
|
|
|
*/
|
|
|
|
if (item && !has_sha1_file(item->util) &&
|
|
|
|
!will_fetch(head, item->util))
|
|
|
|
item->util = NULL;
|
|
|
|
|
|
|
|
/*
|
2010-07-03 12:41:54 +00:00
|
|
|
* For all the tags in the remote_refs string list,
|
|
|
|
* add them to the list of refs to be fetched
|
2009-09-17 07:33:19 +00:00
|
|
|
*/
|
2010-07-03 12:41:54 +00:00
|
|
|
for_each_string_list_item(item, &remote_refs) {
|
|
|
|
/* Unless we have already decided to ignore this item... */
|
|
|
|
if (item->util)
|
|
|
|
{
|
|
|
|
struct ref *rm = alloc_ref(item->string);
|
|
|
|
rm->peer_ref = alloc_ref(item->string);
|
|
|
|
hashcpy(rm->old_sha1, item->util);
|
|
|
|
**tail = rm;
|
|
|
|
*tail = &rm->next;
|
|
|
|
}
|
|
|
|
}
|
2009-09-17 07:33:19 +00:00
|
|
|
|
|
|
|
string_list_clear(&remote_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))
|
2011-02-22 23:41:51 +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
|
|
|
}
|
|
|
|
|
2010-02-24 19:02:05 +00:00
|
|
|
static int truncate_fetch_head(void)
|
|
|
|
{
|
|
|
|
char *filename = git_path("FETCH_HEAD");
|
|
|
|
FILE *fp = fopen(filename, "w");
|
|
|
|
|
|
|
|
if (!fp)
|
2011-02-22 23:41:51 +00:00
|
|
|
return error(_("cannot open %s: %s\n"), filename, strerror(errno));
|
2010-02-24 19:02:05 +00:00
|
|
|
fclose(fp);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-09-11 03:03:25 +00:00
|
|
|
static int do_fetch(struct transport *transport,
|
|
|
|
struct refspec *refs, int ref_count)
|
|
|
|
{
|
2010-07-04 19:46:19 +00:00
|
|
|
struct string_list existing_refs = STRING_LIST_INIT_NODUP;
|
2009-10-25 21:28:12 +00:00
|
|
|
struct string_list_item *peer_item = NULL;
|
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);
|
2009-10-25 21:28:12 +00:00
|
|
|
|
|
|
|
for_each_ref(add_existing, &existing_refs);
|
|
|
|
|
2010-08-11 22:57:20 +00:00
|
|
|
if (tags == TAGS_DEFAULT) {
|
|
|
|
if (transport->remote->fetch_tags == 2)
|
|
|
|
tags = TAGS_SET;
|
|
|
|
if (transport->remote->fetch_tags == -1)
|
|
|
|
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)
|
2011-02-22 23:41:51 +00:00
|
|
|
die(_("Don't know how to fetch from %s"), transport->url);
|
2007-09-11 03:03:25 +00:00
|
|
|
|
|
|
|
/* if not appending, truncate FETCH_HEAD */
|
2009-11-10 08:19:43 +00:00
|
|
|
if (!append && !dry_run) {
|
2010-02-24 19:02:05 +00:00
|
|
|
int errcode = truncate_fetch_head();
|
|
|
|
if (errcode)
|
|
|
|
return errcode;
|
2007-11-22 22:22:23 +00:00
|
|
|
}
|
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) {
|
2009-10-25 21:28:12 +00:00
|
|
|
if (rm->peer_ref) {
|
2010-06-25 23:41:37 +00:00
|
|
|
peer_item = string_list_lookup(&existing_refs,
|
|
|
|
rm->peer_ref->name);
|
2009-10-25 21:28:12 +00:00
|
|
|
if (peer_item)
|
|
|
|
hashcpy(rm->peer_ref->old_sha1,
|
|
|
|
peer_item->util);
|
|
|
|
}
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
2011-10-15 05:04:25 +00:00
|
|
|
if (prune) {
|
2011-10-15 05:04:26 +00:00
|
|
|
/* If --tags was specified, pretend the user gave us the canonical tags refspec */
|
|
|
|
if (tags == TAGS_SET) {
|
|
|
|
const char *tags_str = "refs/tags/*:refs/tags/*";
|
|
|
|
struct refspec *tags_refspec, *refspec;
|
|
|
|
|
|
|
|
/* Copy the refspec and add the tags to it */
|
|
|
|
refspec = xcalloc(ref_count + 1, sizeof(struct refspec));
|
|
|
|
tags_refspec = parse_fetch_refspec(1, &tags_str);
|
|
|
|
memcpy(refspec, refs, ref_count * sizeof(struct refspec));
|
|
|
|
memcpy(&refspec[ref_count], tags_refspec, sizeof(struct refspec));
|
|
|
|
ref_count++;
|
|
|
|
|
|
|
|
prune_refs(refspec, ref_count, ref_map);
|
|
|
|
|
|
|
|
ref_count--;
|
|
|
|
/* The rest of the strings belong to fetch_one */
|
|
|
|
free_refspec(1, tags_refspec);
|
|
|
|
free(refspec);
|
|
|
|
} else if (ref_count) {
|
2011-10-15 05:04:25 +00:00
|
|
|
prune_refs(refs, ref_count, ref_map);
|
2011-10-15 05:04:26 +00:00
|
|
|
} else {
|
2011-10-15 05:04:25 +00:00
|
|
|
prune_refs(transport->remote->fetch, transport->remote->fetch_refspec_nr, ref_map);
|
2011-10-15 05:04:26 +00:00
|
|
|
}
|
2011-10-15 05:04:25 +00:00
|
|
|
}
|
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)
|
2011-02-22 23:41:51 +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)
|
2011-02-22 23:41:51 +00:00
|
|
|
warning(_("Option \"%s\" is ignored for %s\n"),
|
2007-09-18 08:54:57 +00:00
|
|
|
name, transport->url);
|
|
|
|
}
|
|
|
|
|
2009-11-09 20:09:56 +00:00
|
|
|
static int get_one_remote_for_fetch(struct remote *remote, void *priv)
|
|
|
|
{
|
|
|
|
struct string_list *list = priv;
|
2009-11-09 20:11:06 +00:00
|
|
|
if (!remote->skip_default_update)
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(list, remote->name);
|
2009-11-09 20:09:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct remote_group_data {
|
|
|
|
const char *name;
|
|
|
|
struct string_list *list;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int get_remote_group(const char *key, const char *value, void *priv)
|
|
|
|
{
|
|
|
|
struct remote_group_data *g = priv;
|
|
|
|
|
|
|
|
if (!prefixcmp(key, "remotes.") &&
|
|
|
|
!strcmp(key + 8, g->name)) {
|
|
|
|
/* split list by white space */
|
|
|
|
int space = strcspn(value, " \t\n");
|
|
|
|
while (*value) {
|
|
|
|
if (space > 1) {
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(g->list,
|
|
|
|
xstrndup(value, space));
|
2009-11-09 20:09:56 +00:00
|
|
|
}
|
|
|
|
value += space + (value[space] != '\0');
|
|
|
|
space = strcspn(value, " \t\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int add_remote_or_group(const char *name, struct string_list *list)
|
|
|
|
{
|
|
|
|
int prev_nr = list->nr;
|
2010-05-14 09:31:33 +00:00
|
|
|
struct remote_group_data g;
|
|
|
|
g.name = name; g.list = list;
|
2009-11-09 20:09:56 +00:00
|
|
|
|
|
|
|
git_config(get_remote_group, &g);
|
|
|
|
if (list->nr == prev_nr) {
|
|
|
|
struct remote *remote;
|
|
|
|
if (!remote_is_configured(name))
|
|
|
|
return 0;
|
|
|
|
remote = remote_get(name);
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(list, remote->name);
|
2009-11-09 20:09:56 +00:00
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2010-11-12 12:54:52 +00:00
|
|
|
static void add_options_to_argv(int *argc, const char **argv)
|
2009-11-09 20:09:56 +00:00
|
|
|
{
|
2009-11-10 08:19:43 +00:00
|
|
|
if (dry_run)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "--dry-run";
|
2009-11-10 08:15:47 +00:00
|
|
|
if (prune)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "--prune";
|
2010-02-24 18:22:06 +00:00
|
|
|
if (update_head_ok)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "--update-head-ok";
|
2010-02-24 18:22:06 +00:00
|
|
|
if (force)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "--force";
|
2010-02-24 18:22:06 +00:00
|
|
|
if (keep)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "--keep";
|
2010-11-10 23:55:02 +00:00
|
|
|
if (recurse_submodules == RECURSE_SUBMODULES_ON)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "--recurse-submodules";
|
2011-03-06 22:11:21 +00:00
|
|
|
else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
|
|
|
|
argv[(*argc)++] = "--recurse-submodules=on-demand";
|
2009-11-09 20:09:56 +00:00
|
|
|
if (verbosity >= 2)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "-v";
|
2009-11-09 20:09:56 +00:00
|
|
|
if (verbosity >= 1)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "-v";
|
2009-11-09 20:09:56 +00:00
|
|
|
else if (verbosity < 0)
|
2010-11-12 12:54:52 +00:00
|
|
|
argv[(*argc)++] = "-q";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fetch_multiple(struct string_list *list)
|
|
|
|
{
|
|
|
|
int i, result = 0;
|
|
|
|
const char *argv[12] = { "fetch", "--append" };
|
|
|
|
int argc = 2;
|
|
|
|
|
|
|
|
add_options_to_argv(&argc, argv);
|
2009-11-09 20:09:56 +00:00
|
|
|
|
2010-02-24 19:02:05 +00:00
|
|
|
if (!append && !dry_run) {
|
|
|
|
int errcode = truncate_fetch_head();
|
|
|
|
if (errcode)
|
|
|
|
return errcode;
|
|
|
|
}
|
|
|
|
|
2009-11-09 20:09:56 +00:00
|
|
|
for (i = 0; i < list->nr; i++) {
|
|
|
|
const char *name = list->items[i].string;
|
|
|
|
argv[argc] = name;
|
2010-02-24 18:22:06 +00:00
|
|
|
argv[argc + 1] = NULL;
|
2009-11-09 20:09:56 +00:00
|
|
|
if (verbosity >= 0)
|
2011-02-22 23:41:51 +00:00
|
|
|
printf(_("Fetching %s\n"), name);
|
2009-11-09 20:09:56 +00:00
|
|
|
if (run_command_v_opt(argv, RUN_GIT_CMD)) {
|
2011-02-22 23:41:51 +00:00
|
|
|
error(_("Could not fetch %s"), name);
|
2009-11-09 20:09:56 +00:00
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fetch_one(struct remote *remote, int argc, const char **argv)
|
2007-09-11 03:03:25 +00:00
|
|
|
{
|
2007-12-04 07:25:46 +00:00
|
|
|
int i;
|
2007-09-11 03:03:25 +00:00
|
|
|
static const char **refs = NULL;
|
2011-06-08 20:06:33 +00:00
|
|
|
struct refspec *refspec;
|
2007-09-11 03:03:25 +00:00
|
|
|
int ref_nr = 0;
|
2008-04-28 20:23:35 +00:00
|
|
|
int exit_code;
|
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)
|
2011-02-22 23:41:51 +00:00
|
|
|
die(_("No remote repository specified. Please, specify either a URL or a\n"
|
|
|
|
"remote name from which new revisions should be fetched."));
|
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
|
|
|
|
2009-11-18 01:42:22 +00:00
|
|
|
transport = transport_get(remote, NULL);
|
2010-02-24 12:50:28 +00:00
|
|
|
transport_set_verbosity(transport, verbosity, progress);
|
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
|
|
|
|
2009-11-09 20:09:56 +00:00
|
|
|
if (argc > 0) {
|
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 *));
|
2009-11-09 20:09:56 +00:00
|
|
|
for (i = 0; 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)
|
2011-02-22 23:41:51 +00:00
|
|
|
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);
|
2011-06-08 20:06:33 +00:00
|
|
|
refspec = parse_fetch_refspec(ref_nr, refs);
|
|
|
|
exit_code = do_fetch(transport, refspec, ref_nr);
|
2011-10-07 22:51:06 +00:00
|
|
|
free_refspec(ref_nr, refspec);
|
2008-04-28 20:23:35 +00:00
|
|
|
transport_disconnect(transport);
|
|
|
|
transport = NULL;
|
|
|
|
return exit_code;
|
2007-09-11 03:03:25 +00:00
|
|
|
}
|
2009-11-09 20:09:56 +00:00
|
|
|
|
|
|
|
int cmd_fetch(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
int i;
|
2010-07-04 19:46:19 +00:00
|
|
|
struct string_list list = STRING_LIST_INIT_NODUP;
|
2009-11-09 20:09:56 +00:00
|
|
|
struct remote *remote;
|
|
|
|
int result = 0;
|
|
|
|
|
2011-02-24 14:30:19 +00:00
|
|
|
packet_trace_identity("fetch");
|
|
|
|
|
2009-11-09 20:09:56 +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]);
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix,
|
|
|
|
builtin_fetch_options, builtin_fetch_usage, 0);
|
|
|
|
|
2011-09-09 18:22:03 +00:00
|
|
|
if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
|
|
|
|
if (recurse_submodules_default) {
|
|
|
|
int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
|
|
|
|
set_config_fetch_recurse_submodules(arg);
|
|
|
|
}
|
|
|
|
gitmodules_config();
|
|
|
|
git_config(submodule_config, NULL);
|
|
|
|
}
|
|
|
|
|
2009-11-09 20:09:56 +00:00
|
|
|
if (all) {
|
|
|
|
if (argc == 1)
|
2011-02-22 23:41:51 +00:00
|
|
|
die(_("fetch --all does not take a repository argument"));
|
2009-11-09 20:09:56 +00:00
|
|
|
else if (argc > 1)
|
2011-02-22 23:41:51 +00:00
|
|
|
die(_("fetch --all does not make sense with refspecs"));
|
2009-11-09 20:09:56 +00:00
|
|
|
(void) for_each_remote(get_one_remote_for_fetch, &list);
|
|
|
|
result = fetch_multiple(&list);
|
|
|
|
} else if (argc == 0) {
|
|
|
|
/* No arguments -- use default remote */
|
|
|
|
remote = remote_get(NULL);
|
|
|
|
result = fetch_one(remote, argc, argv);
|
2009-11-09 20:10:32 +00:00
|
|
|
} else if (multiple) {
|
|
|
|
/* All arguments are assumed to be remotes or groups */
|
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
if (!add_remote_or_group(argv[i], &list))
|
2011-02-22 23:41:51 +00:00
|
|
|
die(_("No such remote or remote group: %s"), argv[i]);
|
2009-11-09 20:10:32 +00:00
|
|
|
result = fetch_multiple(&list);
|
2009-11-09 20:09:56 +00:00
|
|
|
} else {
|
|
|
|
/* Single remote or group */
|
|
|
|
(void) add_remote_or_group(argv[0], &list);
|
|
|
|
if (list.nr > 1) {
|
|
|
|
/* More than one remote */
|
|
|
|
if (argc > 1)
|
2011-02-22 23:41:51 +00:00
|
|
|
die(_("Fetching a group and specifying refspecs does not make sense"));
|
2009-11-09 20:09:56 +00:00
|
|
|
result = fetch_multiple(&list);
|
|
|
|
} else {
|
|
|
|
/* Zero or one remotes */
|
|
|
|
remote = remote_get(argv[0]);
|
|
|
|
result = fetch_one(remote, argc-1, argv+1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-10 23:55:02 +00:00
|
|
|
if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
|
2010-11-12 12:54:52 +00:00
|
|
|
const char *options[10];
|
|
|
|
int num_options = 0;
|
|
|
|
add_options_to_argv(&num_options, options);
|
|
|
|
result = fetch_populated_submodules(num_options, options,
|
|
|
|
submodule_prefix,
|
2011-03-06 22:11:21 +00:00
|
|
|
recurse_submodules,
|
2010-11-12 12:54:52 +00:00
|
|
|
verbosity < 0);
|
|
|
|
}
|
|
|
|
|
2009-11-09 20:09:56 +00:00
|
|
|
/* All names were strdup()ed or strndup()ed */
|
|
|
|
list.strdup_strings = 1;
|
|
|
|
string_list_clear(&list, 0);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|