6 #include "run-command.h"
10 static const char send_pack_usage
[] =
11 "git-send-pack [--all | --mirror] [--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
, struct ref
*refs
)
154 int len
= packet_read_line(in
, line
, sizeof(line
));
155 if (len
< 10 || memcmp(line
, "unpack ", 7))
156 return error("did not receive remote status");
157 if (memcmp(line
, "unpack ok\n", 10)) {
158 char *p
= line
+ strlen(line
) - 1;
161 error("unpack failed: %s", line
+ 7);
168 len
= packet_read_line(in
, line
, sizeof(line
));
172 (memcmp(line
, "ok ", 3) && memcmp(line
, "ng ", 3))) {
173 fprintf(stderr
, "protocol error: %s\n", line
);
178 line
[strlen(line
)-1] = '\0';
180 msg
= strchr(refname
, ' ');
184 /* first try searching at our hint, falling back to all refs */
186 hint
= find_ref_by_name(hint
, refname
);
188 hint
= find_ref_by_name(refs
, refname
);
190 warning("remote reported status on unknown ref: %s",
194 if (hint
->status
!= REF_STATUS_EXPECTING_REPORT
) {
195 warning("remote reported status on unexpected ref: %s",
200 if (line
[0] == 'o' && line
[1] == 'k')
201 hint
->status
= REF_STATUS_OK
;
203 hint
->status
= REF_STATUS_REMOTE_REJECT
;
207 hint
->remote_status
= xstrdup(msg
);
208 /* start our next search from the next ref */
214 static void update_tracking_ref(struct remote
*remote
, struct ref
*ref
)
218 if (ref
->status
!= REF_STATUS_OK
)
224 if (!remote_find_tracking(remote
, &rs
)) {
226 fprintf(stderr
, "updating local tracking ref '%s'\n", rs
.dst
);
228 if (delete_ref(rs
.dst
, NULL
))
229 error("Failed to delete");
231 update_ref("update by push", rs
.dst
,
232 ref
->new_sha1
, NULL
, 0, 0);
237 static const char *prettify_ref(const struct ref
*ref
)
239 const char *name
= ref
->name
;
241 !prefixcmp(name
, "refs/heads/") ? 11 :
242 !prefixcmp(name
, "refs/tags/") ? 10 :
243 !prefixcmp(name
, "refs/remotes/") ? 13 :
247 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
249 static void print_ref_status(char flag
, const char *summary
, struct ref
*to
, struct ref
*from
, const char *msg
)
251 fprintf(stderr
, " %c %-*s ", flag
, SUMMARY_WIDTH
, summary
);
253 fprintf(stderr
, "%s -> %s", prettify_ref(from
), prettify_ref(to
));
255 fputs(prettify_ref(to
), stderr
);
264 static const char *status_abbrev(unsigned char sha1
[20])
267 abbrev
= find_unique_abbrev(sha1
, DEFAULT_ABBREV
);
268 return abbrev
? abbrev
: sha1_to_hex(sha1
);
271 static void print_ok_ref_status(struct ref
*ref
)
274 print_ref_status('-', "[deleted]", ref
, NULL
, NULL
);
275 else if (is_null_sha1(ref
->old_sha1
))
276 print_ref_status('*',
277 (!prefixcmp(ref
->name
, "refs/tags/") ? "[new tag]" :
279 ref
, ref
->peer_ref
, NULL
);
285 strcpy(quickref
, status_abbrev(ref
->old_sha1
));
286 if (ref
->nonfastforward
) {
287 strcat(quickref
, "...");
289 msg
= "forced update";
291 strcat(quickref
, "..");
295 strcat(quickref
, status_abbrev(ref
->new_sha1
));
297 print_ref_status(type
, quickref
, ref
, ref
->peer_ref
, msg
);
301 static int print_one_push_status(struct ref
*ref
, const char *dest
, int count
)
304 fprintf(stderr
, "To %s\n", dest
);
306 switch(ref
->status
) {
307 case REF_STATUS_NONE
:
308 print_ref_status('X', "[no match]", ref
, NULL
, NULL
);
310 case REF_STATUS_REJECT_NODELETE
:
311 print_ref_status('!', "[rejected]", ref
, NULL
,
312 "remote does not support deleting refs");
314 case REF_STATUS_UPTODATE
:
315 print_ref_status('=', "[up to date]", ref
,
316 ref
->peer_ref
, NULL
);
318 case REF_STATUS_REJECT_NONFASTFORWARD
:
319 print_ref_status('!', "[rejected]", ref
, ref
->peer_ref
,
322 case REF_STATUS_REMOTE_REJECT
:
323 print_ref_status('!', "[remote rejected]", ref
,
324 ref
->deletion
? NULL
: ref
->peer_ref
,
327 case REF_STATUS_EXPECTING_REPORT
:
328 print_ref_status('!', "[remote failure]", ref
,
329 ref
->deletion
? NULL
: ref
->peer_ref
,
330 "remote failed to report status");
333 print_ok_ref_status(ref
);
340 static void print_push_status(const char *dest
, struct ref
*refs
)
346 for (ref
= refs
; ref
; ref
= ref
->next
)
347 if (ref
->status
== REF_STATUS_UPTODATE
)
348 n
+= print_one_push_status(ref
, dest
, n
);
351 for (ref
= refs
; ref
; ref
= ref
->next
)
352 if (ref
->status
== REF_STATUS_OK
)
353 n
+= print_one_push_status(ref
, dest
, n
);
355 for (ref
= refs
; ref
; ref
= ref
->next
) {
356 if (ref
->status
!= REF_STATUS_NONE
&&
357 ref
->status
!= REF_STATUS_UPTODATE
&&
358 ref
->status
!= REF_STATUS_OK
)
359 n
+= print_one_push_status(ref
, dest
, n
);
363 static int refs_pushed(struct ref
*ref
)
365 for (; ref
; ref
= ref
->next
) {
366 switch(ref
->status
) {
367 case REF_STATUS_NONE
:
368 case REF_STATUS_UPTODATE
:
377 static int do_send_pack(int in
, int out
, struct remote
*remote
, const char *dest
, int nr_refspec
, const char **refspec
)
381 int ask_for_status_report
= 0;
382 int allow_deleting_refs
= 0;
383 int expect_status_report
= 0;
384 int flags
= MATCH_REFS_NONE
;
388 flags
|= MATCH_REFS_ALL
;
389 if (args
.send_mirror
)
390 flags
|= MATCH_REFS_MIRROR
;
392 /* No funny business with the matcher */
393 remote_tail
= get_remote_heads(in
, &remote_refs
, 0, NULL
, REF_NORMAL
);
396 /* Does the other end support the reporting? */
397 if (server_supports("report-status"))
398 ask_for_status_report
= 1;
399 if (server_supports("delete-refs"))
400 allow_deleting_refs
= 1;
404 remote_tail
= &remote_refs
;
405 if (match_refs(local_refs
, remote_refs
, &remote_tail
,
406 nr_refspec
, refspec
, flags
))
410 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n"
411 "Perhaps you should specify a branch such as 'master'.\n");
416 * Finally, tell the other end!
419 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
420 const unsigned char *new_sha1
;
422 if (!ref
->peer_ref
) {
423 if (!args
.send_mirror
)
425 new_sha1
= null_sha1
;
428 new_sha1
= ref
->peer_ref
->new_sha1
;
431 ref
->deletion
= is_null_sha1(new_sha1
);
432 if (ref
->deletion
&& !allow_deleting_refs
) {
433 ref
->status
= REF_STATUS_REJECT_NODELETE
;
436 if (!ref
->deletion
&&
437 !hashcmp(ref
->old_sha1
, new_sha1
)) {
438 ref
->status
= REF_STATUS_UPTODATE
;
442 /* This part determines what can overwrite what.
445 * (0) you can always use --force or +A:B notation to
446 * selectively force individual ref pairs.
448 * (1) if the old thing does not exist, it is OK.
450 * (2) if you do not have the old thing, you are not allowed
451 * to overwrite it; you would not know what you are losing
454 * (3) if both new and old are commit-ish, and new is a
455 * descendant of old, it is OK.
457 * (4) regardless of all of the above, removing :B is
461 ref
->nonfastforward
=
463 !is_null_sha1(ref
->old_sha1
) &&
464 (!has_sha1_file(ref
->old_sha1
)
465 || !ref_newer(new_sha1
, ref
->old_sha1
));
467 if (ref
->nonfastforward
&& !ref
->force
&& !args
.force_update
) {
468 ref
->status
= REF_STATUS_REJECT_NONFASTFORWARD
;
472 hashcpy(ref
->new_sha1
, new_sha1
);
477 char *old_hex
= sha1_to_hex(ref
->old_sha1
);
478 char *new_hex
= sha1_to_hex(ref
->new_sha1
);
480 if (ask_for_status_report
) {
481 packet_write(out
, "%s %s %s%c%s",
482 old_hex
, new_hex
, ref
->name
, 0,
484 ask_for_status_report
= 0;
485 expect_status_report
= 1;
488 packet_write(out
, "%s %s %s",
489 old_hex
, new_hex
, ref
->name
);
491 ref
->status
= expect_status_report
?
492 REF_STATUS_EXPECTING_REPORT
:
497 if (new_refs
&& !args
.dry_run
) {
498 if (pack_objects(out
, remote_refs
) < 0) {
505 if (expect_status_report
)
506 ret
= receive_status(in
, remote_refs
);
510 print_push_status(dest
, remote_refs
);
512 if (!args
.dry_run
&& remote
) {
513 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
514 update_tracking_ref(remote
, ref
);
517 if (!refs_pushed(remote_refs
))
518 fprintf(stderr
, "Everything up-to-date\n");
521 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
522 switch (ref
->status
) {
523 case REF_STATUS_NONE
:
524 case REF_STATUS_UPTODATE
:
534 static void verify_remote_names(int nr_heads
, const char **heads
)
538 for (i
= 0; i
< nr_heads
; i
++) {
539 const char *remote
= strrchr(heads
[i
], ':');
541 remote
= remote
? (remote
+ 1) : heads
[i
];
542 switch (check_ref_format(remote
)) {
544 case CHECK_REF_FORMAT_ONELEVEL
:
545 /* ok but a single level -- that is fine for
548 case CHECK_REF_FORMAT_WILDCARD
:
549 /* ok but ends with a pattern-match character */
552 die("remote part of refspec is not a valid name in %s",
557 int cmd_send_pack(int argc
, const char **argv
, const char *prefix
)
560 const char **heads
= NULL
;
561 const char *remote_name
= NULL
;
562 struct remote
*remote
= NULL
;
563 const char *dest
= NULL
;
566 for (i
= 1; i
< argc
; i
++, argv
++) {
567 const char *arg
= *argv
;
570 if (!prefixcmp(arg
, "--receive-pack=")) {
571 args
.receivepack
= arg
+ 15;
574 if (!prefixcmp(arg
, "--exec=")) {
575 args
.receivepack
= arg
+ 7;
578 if (!prefixcmp(arg
, "--remote=")) {
579 remote_name
= arg
+ 9;
582 if (!strcmp(arg
, "--all")) {
586 if (!strcmp(arg
, "--dry-run")) {
590 if (!strcmp(arg
, "--mirror")) {
591 args
.send_mirror
= 1;
594 if (!strcmp(arg
, "--force")) {
595 args
.force_update
= 1;
598 if (!strcmp(arg
, "--verbose")) {
602 if (!strcmp(arg
, "--thin")) {
603 args
.use_thin_pack
= 1;
606 usage(send_pack_usage
);
612 heads
= (const char **) argv
;
617 usage(send_pack_usage
);
619 * --all and --mirror are incompatible; neither makes sense
622 if ((heads
&& (args
.send_all
|| args
.send_mirror
)) ||
623 (args
.send_all
&& args
.send_mirror
))
624 usage(send_pack_usage
);
627 remote
= remote_get(remote_name
);
628 if (!remote_has_url(remote
, dest
)) {
629 die("Destination %s is not a uri for %s",
634 return send_pack(&args
, dest
, remote
, nr_heads
, heads
);
637 int send_pack(struct send_pack_args
*my_args
,
638 const char *dest
, struct remote
*remote
,
639 int nr_heads
, const char **heads
)
642 struct child_process
*conn
;
644 memcpy(&args
, my_args
, sizeof(args
));
646 verify_remote_names(nr_heads
, heads
);
648 conn
= git_connect(fd
, dest
, args
.receivepack
, args
.verbose
? CONNECT_VERBOSE
: 0);
649 ret
= do_send_pack(fd
[0], fd
[1], remote
, dest
, nr_heads
, heads
);
652 ret
|= finish_connect(conn
);