mirror of
https://github.com/git/git.git
synced 2024-11-18 23:43:50 +01:00
9f0ea7e828
When pushing a refspec like "HEAD", we used to treat it as "HEAD:HEAD", which didn't work without rewriting. Instead, we should resolve the ref. If it's a symref, further require it to point to a branch, to avoid doing anything especially unexpected. Also remove the rewriting previously added in builtin-push. Since the code for "HEAD" uses the regular refspec parsing, it automatically handles "+HEAD" without anything special. [jc: added a further test to make sure that "remote.*.push = HEAD" works] Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
144 lines
3.5 KiB
C
144 lines
3.5 KiB
C
/*
|
|
* "git push"
|
|
*/
|
|
#include "cache.h"
|
|
#include "refs.h"
|
|
#include "run-command.h"
|
|
#include "builtin.h"
|
|
#include "remote.h"
|
|
#include "transport.h"
|
|
#include "parse-options.h"
|
|
|
|
static const char * const push_usage[] = {
|
|
"git-push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]",
|
|
NULL,
|
|
};
|
|
|
|
static int thin, verbose;
|
|
static const char *receivepack;
|
|
|
|
static const char **refspec;
|
|
static int refspec_nr;
|
|
|
|
static void add_refspec(const char *ref)
|
|
{
|
|
int nr = refspec_nr + 1;
|
|
refspec = xrealloc(refspec, nr * sizeof(char *));
|
|
refspec[nr-1] = ref;
|
|
refspec_nr = nr;
|
|
}
|
|
|
|
static void set_refspecs(const char **refs, int nr)
|
|
{
|
|
int i;
|
|
for (i = 0; i < nr; i++) {
|
|
const char *ref = refs[i];
|
|
if (!strcmp("tag", ref)) {
|
|
char *tag;
|
|
int len;
|
|
if (nr <= ++i)
|
|
die("tag shorthand without <tag>");
|
|
len = strlen(refs[i]) + 11;
|
|
tag = xmalloc(len);
|
|
strcpy(tag, "refs/tags/");
|
|
strcat(tag, refs[i]);
|
|
ref = tag;
|
|
}
|
|
add_refspec(ref);
|
|
}
|
|
}
|
|
|
|
static int do_push(const char *repo, int flags)
|
|
{
|
|
int i, errs;
|
|
struct remote *remote = remote_get(repo);
|
|
|
|
if (!remote)
|
|
die("bad repository '%s'", repo);
|
|
|
|
if (!refspec
|
|
&& !(flags & TRANSPORT_PUSH_ALL)
|
|
&& remote->push_refspec_nr) {
|
|
refspec = remote->push_refspec;
|
|
refspec_nr = remote->push_refspec_nr;
|
|
}
|
|
errs = 0;
|
|
for (i = 0; i < remote->url_nr; i++) {
|
|
struct transport *transport =
|
|
transport_get(remote, remote->url[i]);
|
|
int err;
|
|
if (receivepack)
|
|
transport_set_option(transport,
|
|
TRANS_OPT_RECEIVEPACK, receivepack);
|
|
if (thin)
|
|
transport_set_option(transport, TRANS_OPT_THIN, "yes");
|
|
|
|
if (verbose)
|
|
fprintf(stderr, "Pushing to %s\n", remote->url[i]);
|
|
err = transport_push(transport, refspec_nr, refspec, flags);
|
|
err |= transport_disconnect(transport);
|
|
|
|
if (!err)
|
|
continue;
|
|
|
|
error("failed to push some refs to '%s'", remote->url[i]);
|
|
errs++;
|
|
}
|
|
return !!errs;
|
|
}
|
|
|
|
int cmd_push(int argc, const char **argv, const char *prefix)
|
|
{
|
|
int flags = 0;
|
|
int all = 0;
|
|
int mirror = 0;
|
|
int dry_run = 0;
|
|
int force = 0;
|
|
int tags = 0;
|
|
const char *repo = NULL; /* default repository */
|
|
|
|
struct option options[] = {
|
|
OPT__VERBOSE(&verbose),
|
|
OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
|
|
OPT_BOOLEAN( 0 , "all", &all, "push all refs"),
|
|
OPT_BOOLEAN( 0 , "mirror", &mirror, "mirror all refs"),
|
|
OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
|
|
OPT_BOOLEAN( 0 , "dry-run", &dry_run, "dry run"),
|
|
OPT_BOOLEAN('f', "force", &force, "force updates"),
|
|
OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
|
|
OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
|
|
OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
|
|
OPT_END()
|
|
};
|
|
|
|
argc = parse_options(argc, argv, options, push_usage, 0);
|
|
|
|
if (force)
|
|
flags |= TRANSPORT_PUSH_FORCE;
|
|
if (dry_run)
|
|
flags |= TRANSPORT_PUSH_DRY_RUN;
|
|
if (verbose)
|
|
flags |= TRANSPORT_PUSH_VERBOSE;
|
|
if (tags)
|
|
add_refspec("refs/tags/*");
|
|
if (all)
|
|
flags |= TRANSPORT_PUSH_ALL;
|
|
if (mirror)
|
|
flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
|
|
|
|
if (argc > 0) {
|
|
repo = argv[0];
|
|
set_refspecs(argv + 1, argc - 1);
|
|
}
|
|
if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) && refspec)
|
|
usage_with_options(push_usage, options);
|
|
|
|
if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
|
|
(TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
|
|
error("--all and --mirror are incompatible");
|
|
usage_with_options(push_usage, options);
|
|
}
|
|
|
|
return do_push(repo, flags);
|
|
}
|