6 #include "run-command.h"
10 static const char send_pack_usage
[] =
11 "git-send-pack [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
12 " --all and explicit <ref> specification are mutually exclusive.";
14 static struct send_pack_args args
= {
15 /* .receivepack = */ "git-receive-pack",
19 * Make a pack stream and spit it out into file descriptor fd
21 static int pack_objects(int fd
, struct ref
*refs
)
24 * The child becomes pack-objects --revs; we feed
25 * the revision parameters to it via its stdin and
26 * let its stdout go back to the other end.
28 const char *argv
[] = {
36 struct child_process po
;
38 if (args
.use_thin_pack
)
40 memset(&po
, 0, sizeof(po
));
45 if (start_command(&po
))
46 die("git-pack-objects failed (%s)", strerror(errno
));
49 * We feed the pack-objects we just spawned with revision
50 * parameters by writing to the pipe.
55 if (!is_null_sha1(refs
->old_sha1
) &&
56 has_sha1_file(refs
->old_sha1
)) {
57 memcpy(buf
+ 1, sha1_to_hex(refs
->old_sha1
), 40);
60 if (!write_or_whine(po
.in
, buf
, 42,
61 "send-pack: send refs"))
64 if (!is_null_sha1(refs
->new_sha1
)) {
65 memcpy(buf
, sha1_to_hex(refs
->new_sha1
), 40);
67 if (!write_or_whine(po
.in
, buf
, 41,
68 "send-pack: send refs"))
74 if (finish_command(&po
))
75 return error("pack-objects died with strange error");
79 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
82 struct commit_list
*temp
= list
;
83 temp
->item
->object
.flags
&= ~mark
;
89 static int ref_newer(const unsigned char *new_sha1
,
90 const unsigned char *old_sha1
)
93 struct commit
*old
, *new;
94 struct commit_list
*list
, *used
;
97 /* Both new and old must be commit-ish and new is descendant of
98 * old. Otherwise we require --force.
100 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
101 if (!o
|| o
->type
!= OBJ_COMMIT
)
103 old
= (struct commit
*) o
;
105 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
106 if (!o
|| o
->type
!= OBJ_COMMIT
)
108 new = (struct commit
*) o
;
110 if (parse_commit(new) < 0)
114 commit_list_insert(new, &list
);
116 new = pop_most_recent_commit(&list
, 1);
117 commit_list_insert(new, &used
);
123 unmark_and_free(list
, 1);
124 unmark_and_free(used
, 1);
128 static struct ref
*local_refs
, **local_tail
;
129 static struct ref
*remote_refs
, **remote_tail
;
131 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
134 int len
= strlen(refname
) + 1;
135 ref
= xcalloc(1, sizeof(*ref
) + len
);
136 hashcpy(ref
->new_sha1
, sha1
);
137 memcpy(ref
->name
, refname
, len
);
139 local_tail
= &ref
->next
;
143 static void get_local_heads(void)
145 local_tail
= &local_refs
;
146 for_each_ref(one_local_ref
, NULL
);
149 static int receive_status(int in
)
153 int len
= packet_read_line(in
, line
, sizeof(line
));
154 if (len
< 10 || memcmp(line
, "unpack ", 7)) {
155 fprintf(stderr
, "did not receive status back\n");
158 if (memcmp(line
, "unpack ok\n", 10)) {
163 len
= packet_read_line(in
, line
, sizeof(line
));
167 (memcmp(line
, "ok", 2) && memcmp(line
, "ng", 2))) {
168 fprintf(stderr
, "protocol error: %s\n", line
);
172 if (!memcmp(line
, "ok", 2))
180 static void update_tracking_ref(struct remote
*remote
, struct ref
*ref
)
191 will_delete_ref
= is_null_sha1(ref
->peer_ref
->new_sha1
);
193 if (!will_delete_ref
&&
194 !hashcmp(ref
->old_sha1
, ref
->peer_ref
->new_sha1
))
197 if (!remote_find_tracking(remote
, &rs
)) {
199 fprintf(stderr
, "updating local tracking ref '%s'\n", rs
.dst
);
200 if (is_null_sha1(ref
->peer_ref
->new_sha1
)) {
201 if (delete_ref(rs
.dst
, NULL
))
202 error("Failed to delete");
204 update_ref("update by push", rs
.dst
,
205 ref
->new_sha1
, NULL
, 0, 0);
210 static const char *prettify_ref(const char *name
)
213 !prefixcmp(name
, "refs/heads/") ? 11 :
214 !prefixcmp(name
, "refs/tags/") ? 10 :
215 !prefixcmp(name
, "refs/remotes/") ? 13 :
219 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
221 static int do_send_pack(int in
, int out
, struct remote
*remote
, const char *dest
, int nr_refspec
, const char **refspec
)
226 int ask_for_status_report
= 0;
227 int allow_deleting_refs
= 0;
228 int expect_status_report
= 0;
231 /* No funny business with the matcher */
232 remote_tail
= get_remote_heads(in
, &remote_refs
, 0, NULL
, REF_NORMAL
);
235 /* Does the other end support the reporting? */
236 if (server_supports("report-status"))
237 ask_for_status_report
= 1;
238 if (server_supports("delete-refs"))
239 allow_deleting_refs
= 1;
243 remote_tail
= &remote_refs
;
244 if (match_refs(local_refs
, remote_refs
, &remote_tail
,
245 nr_refspec
, refspec
, args
.send_all
))
249 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n"
250 "Perhaps you should specify a branch such as 'master'.\n");
255 * Finally, tell the other end!
258 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
259 char old_hex
[60], *new_hex
;
261 const char *pretty_ref
;
262 const char *pretty_peer
;
268 fprintf(stderr
, "To %s\n", dest
);
272 pretty_ref
= prettify_ref(ref
->name
);
273 pretty_peer
= prettify_ref(ref
->peer_ref
->name
);
275 will_delete_ref
= is_null_sha1(ref
->peer_ref
->new_sha1
);
276 if (will_delete_ref
&& !allow_deleting_refs
) {
277 fprintf(stderr
, " ! %-*s %s (remote does not support deleting refs)\n",
278 SUMMARY_WIDTH
, "[rejected]", pretty_ref
);
282 if (!will_delete_ref
&&
283 !hashcmp(ref
->old_sha1
, ref
->peer_ref
->new_sha1
)) {
285 fprintf(stderr
, " = %-*s %s -> %s\n",
286 SUMMARY_WIDTH
, "[up to date]",
287 pretty_peer
, pretty_ref
);
291 /* This part determines what can overwrite what.
294 * (0) you can always use --force or +A:B notation to
295 * selectively force individual ref pairs.
297 * (1) if the old thing does not exist, it is OK.
299 * (2) if you do not have the old thing, you are not allowed
300 * to overwrite it; you would not know what you are losing
303 * (3) if both new and old are commit-ish, and new is a
304 * descendant of old, it is OK.
306 * (4) regardless of all of the above, removing :B is
310 if (!args
.force_update
&&
312 !is_null_sha1(ref
->old_sha1
) &&
314 if (!has_sha1_file(ref
->old_sha1
) ||
315 !ref_newer(ref
->peer_ref
->new_sha1
,
317 /* We do not have the remote ref, or
318 * we know that the remote ref is not
319 * an ancestor of what we are trying to
320 * push. Either way this can be losing
321 * commits at the remote end and likely
322 * we were not up to date to begin with.
324 fprintf(stderr
, " ! %-*s %s -> %s (non-fast forward)\n",
325 SUMMARY_WIDTH
, "[rejected]",
326 pretty_peer
, pretty_ref
);
331 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
332 if (!will_delete_ref
)
334 strcpy(old_hex
, sha1_to_hex(ref
->old_sha1
));
335 new_hex
= sha1_to_hex(ref
->new_sha1
);
338 if (ask_for_status_report
) {
339 packet_write(out
, "%s %s %s%c%s",
340 old_hex
, new_hex
, ref
->name
, 0,
342 ask_for_status_report
= 0;
343 expect_status_report
= 1;
346 packet_write(out
, "%s %s %s",
347 old_hex
, new_hex
, ref
->name
);
350 fprintf(stderr
, " - %-*s %s\n",
351 SUMMARY_WIDTH
, "[deleting]",
353 else if (is_null_sha1(ref
->old_sha1
)) {
356 if (!prefixcmp(ref
->name
, "refs/tags/"))
359 msg
= "[new branch]";
360 fprintf(stderr
, " * %-*s %s -> %s\n",
362 pretty_peer
, pretty_ref
);
367 const char *msg
= "";
369 old_abb
= find_unique_abbrev(ref
->old_sha1
, DEFAULT_ABBREV
);
370 strcpy(quickref
, old_abb
? old_abb
: old_hex
);
371 if (ref_newer(ref
->peer_ref
->new_sha1
, ref
->old_sha1
))
372 strcat(quickref
, "..");
374 strcat(quickref
, "...");
376 msg
= " (forced update)";
378 strcat(quickref
, find_unique_abbrev(ref
->new_sha1
, DEFAULT_ABBREV
));
380 fprintf(stderr
, " %c %-*s %s -> %s%s\n",
382 SUMMARY_WIDTH
, quickref
,
383 pretty_peer
, pretty_ref
,
389 if (new_refs
&& !args
.dry_run
)
390 ret
= pack_objects(out
, remote_refs
);
393 if (expect_status_report
) {
394 if (receive_status(in
))
398 if (!args
.dry_run
&& remote
&& ret
== 0) {
399 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
400 update_tracking_ref(remote
, ref
);
403 if (!new_refs
&& ret
== 0)
404 fprintf(stderr
, "Everything up-to-date\n");
408 static void verify_remote_names(int nr_heads
, const char **heads
)
412 for (i
= 0; i
< nr_heads
; i
++) {
413 const char *remote
= strchr(heads
[i
], ':');
415 remote
= remote
? (remote
+ 1) : heads
[i
];
416 switch (check_ref_format(remote
)) {
418 case -2: /* ok but a single level -- that is fine for
421 case -3: /* ok but ends with a pattern-match character */
424 die("remote part of refspec is not a valid name in %s",
429 int cmd_send_pack(int argc
, const char **argv
, const char *prefix
)
432 const char **heads
= NULL
;
433 const char *remote_name
= NULL
;
434 struct remote
*remote
= NULL
;
435 const char *dest
= NULL
;
438 for (i
= 1; i
< argc
; i
++, argv
++) {
439 const char *arg
= *argv
;
442 if (!prefixcmp(arg
, "--receive-pack=")) {
443 args
.receivepack
= arg
+ 15;
446 if (!prefixcmp(arg
, "--exec=")) {
447 args
.receivepack
= arg
+ 7;
450 if (!prefixcmp(arg
, "--remote=")) {
451 remote_name
= arg
+ 9;
454 if (!strcmp(arg
, "--all")) {
458 if (!strcmp(arg
, "--dry-run")) {
462 if (!strcmp(arg
, "--force")) {
463 args
.force_update
= 1;
466 if (!strcmp(arg
, "--verbose")) {
470 if (!strcmp(arg
, "--thin")) {
471 args
.use_thin_pack
= 1;
474 usage(send_pack_usage
);
480 heads
= (const char **) argv
;
485 usage(send_pack_usage
);
486 if (heads
&& args
.send_all
)
487 usage(send_pack_usage
);
490 remote
= remote_get(remote_name
);
491 if (!remote_has_url(remote
, dest
)) {
492 die("Destination %s is not a uri for %s",
497 return send_pack(&args
, dest
, remote
, nr_heads
, heads
);
500 int send_pack(struct send_pack_args
*my_args
,
501 const char *dest
, struct remote
*remote
,
502 int nr_heads
, const char **heads
)
505 struct child_process
*conn
;
507 memcpy(&args
, my_args
, sizeof(args
));
509 verify_remote_names(nr_heads
, heads
);
511 conn
= git_connect(fd
, dest
, args
.receivepack
, args
.verbose
? CONNECT_VERBOSE
: 0);
512 ret
= do_send_pack(fd
[0], fd
[1], remote
, dest
, nr_heads
, heads
);
515 ret
|= finish_connect(conn
);