]> git.ipfire.org Git - thirdparty/git.git/blame - builtin-push.c
Make error messages from cherry-pick/revert more sensible
[thirdparty/git.git] / builtin-push.c
CommitLineData
755225de
LT
1/*
2 * "git push"
3 */
4#include "cache.h"
5#include "refs.h"
6#include "run-command.h"
7#include "builtin.h"
5751f490 8#include "remote.h"
9b288516 9#include "transport.h"
378c4832 10#include "parse-options.h"
755225de 11
378c4832 12static const char * const push_usage[] = {
94c89ba6 13 "git-push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]",
378c4832
DB
14 NULL,
15};
755225de 16
18184f79 17static int thin, verbose;
d23842fd 18static const char *receivepack;
755225de 19
96f1e58f
DR
20static const char **refspec;
21static int refspec_nr;
755225de
LT
22
23static void add_refspec(const char *ref)
24{
25 int nr = refspec_nr + 1;
26 refspec = xrealloc(refspec, nr * sizeof(char *));
27 refspec[nr-1] = ref;
28 refspec_nr = nr;
29}
30
755225de
LT
31static void set_refspecs(const char **refs, int nr)
32{
8558fd9e
DB
33 int i;
34 for (i = 0; i < nr; i++) {
35 const char *ref = refs[i];
36 if (!strcmp("tag", ref)) {
37 char *tag;
38 int len;
39 if (nr <= ++i)
40 die("tag shorthand without <tag>");
41 len = strlen(refs[i]) + 11;
42 tag = xmalloc(len);
43 strcpy(tag, "refs/tags/");
44 strcat(tag, refs[i]);
45 ref = tag;
411fb8ba 46 }
47d996a2
SP
47 if (!strcmp("HEAD", ref)) {
48 unsigned char sha1_dummy[20];
49 ref = resolve_ref(ref, sha1_dummy, 1, NULL);
50 if (!ref)
51 die("HEAD cannot be resolved.");
52 if (prefixcmp(ref, "refs/heads/"))
53 die("HEAD cannot be resolved to branch.");
54 ref = xstrdup(ref + 11);
55 }
8558fd9e 56 add_refspec(ref);
755225de 57 }
755225de
LT
58}
59
9b288516 60static int do_push(const char *repo, int flags)
755225de 61{
5751f490 62 int i, errs;
5751f490 63 struct remote *remote = remote_get(repo);
755225de 64
5751f490 65 if (!remote)
755225de
LT
66 die("bad repository '%s'", repo);
67
18184f79
SP
68 if (!refspec
69 && !(flags & TRANSPORT_PUSH_ALL)
70 && remote->push_refspec_nr) {
8558fd9e
DB
71 refspec = remote->push_refspec;
72 refspec_nr = remote->push_refspec_nr;
5751f490 73 }
fd1d1b05 74 errs = 0;
28b91f8a 75 for (i = 0; i < remote->url_nr; i++) {
9b288516 76 struct transport *transport =
28b91f8a 77 transport_get(remote, remote->url[i]);
60b7f38e 78 int err;
9b288516
DB
79 if (receivepack)
80 transport_set_option(transport,
81 TRANS_OPT_RECEIVEPACK, receivepack);
82 if (thin)
83 transport_set_option(transport, TRANS_OPT_THIN, "yes");
84
bcc785f6 85 if (verbose)
28b91f8a 86 fprintf(stderr, "Pushing to %s\n", remote->url[i]);
9b288516
DB
87 err = transport_push(transport, refspec_nr, refspec, flags);
88 err |= transport_disconnect(transport);
89
60b7f38e 90 if (!err)
755225de 91 continue;
39878b0c 92
28b91f8a 93 error("failed to push to '%s'", remote->url[i]);
fd1d1b05 94 errs++;
755225de 95 }
fd1d1b05 96 return !!errs;
755225de
LT
97}
98
a633fca0 99int cmd_push(int argc, const char **argv, const char *prefix)
755225de 100{
9b288516 101 int flags = 0;
378c4832 102 int all = 0;
94c89ba6 103 int mirror = 0;
378c4832
DB
104 int dry_run = 0;
105 int force = 0;
106 int tags = 0;
5751f490 107 const char *repo = NULL; /* default repository */
755225de 108
378c4832
DB
109 struct option options[] = {
110 OPT__VERBOSE(&verbose),
111 OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
112 OPT_BOOLEAN( 0 , "all", &all, "push all refs"),
94c89ba6 113 OPT_BOOLEAN( 0 , "mirror", &mirror, "mirror all refs"),
378c4832
DB
114 OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
115 OPT_BOOLEAN( 0 , "dry-run", &dry_run, "dry run"),
116 OPT_BOOLEAN('f', "force", &force, "force updates"),
117 OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
118 OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
119 OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
120 OPT_END()
121 };
755225de 122
378c4832
DB
123 argc = parse_options(argc, argv, options, push_usage, 0);
124
125 if (force)
126 flags |= TRANSPORT_PUSH_FORCE;
127 if (dry_run)
128 flags |= TRANSPORT_PUSH_DRY_RUN;
1b2486d7
SP
129 if (verbose)
130 flags |= TRANSPORT_PUSH_VERBOSE;
378c4832
DB
131 if (tags)
132 add_refspec("refs/tags/*");
133 if (all)
134 flags |= TRANSPORT_PUSH_ALL;
94c89ba6
AW
135 if (mirror)
136 flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
378c4832
DB
137
138 if (argc > 0) {
139 repo = argv[0];
140 set_refspecs(argv + 1, argc - 1);
755225de 141 }
94c89ba6 142 if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) && refspec)
378c4832 143 usage_with_options(push_usage, options);
8558fd9e 144
94c89ba6
AW
145 if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
146 (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
147 error("--all and --mirror are incompatible");
148 usage_with_options(push_usage, options);
149 }
150
9b288516 151 return do_push(repo, flags);
755225de 152}