2 #include "repository.h"
9 #include "run-command.h"
15 #include "string-list.h"
16 #include "oid-array.h"
17 #include "connected.h"
18 #include "argv-array.h"
21 #include "gpg-interface.h"
24 #include "tmp-objdir.h"
27 #include "object-store.h"
29 #include "commit-reach.h"
32 static const char * const receive_pack_usage
[] = {
33 N_("git receive-pack <git-dir>"),
45 static int deny_deletes
;
46 static int deny_non_fast_forwards
;
47 static enum deny_action deny_current_branch
= DENY_UNCONFIGURED
;
48 static enum deny_action deny_delete_current
= DENY_UNCONFIGURED
;
49 static int receive_fsck_objects
= -1;
50 static int transfer_fsck_objects
= -1;
51 static struct strbuf fsck_msg_types
= STRBUF_INIT
;
52 static int receive_unpack_limit
= -1;
53 static int transfer_unpack_limit
= -1;
54 static int advertise_atomic_push
= 1;
55 static int advertise_push_options
;
56 static int unpack_limit
= 100;
57 static off_t max_input_size
;
58 static int report_status
;
59 static int report_status_v2
;
60 static int use_sideband
;
61 static int use_atomic
;
62 static int use_push_options
;
64 static int prefer_ofs_delta
= 1;
65 static int auto_update_server_info
;
66 static int auto_gc
= 1;
67 static int reject_thin
;
68 static int stateless_rpc
;
69 static const char *service_dir
;
70 static const char *head_name
;
71 static void *head_name_to_free
;
72 static int sent_capabilities
;
73 static int shallow_update
;
74 static const char *alt_shallow_file
;
75 static struct strbuf push_cert
= STRBUF_INIT
;
76 static struct object_id push_cert_oid
;
77 static struct signature_check sigcheck
;
78 static const char *push_cert_nonce
;
79 static const char *cert_nonce_seed
;
81 static const char *NONCE_UNSOLICITED
= "UNSOLICITED";
82 static const char *NONCE_BAD
= "BAD";
83 static const char *NONCE_MISSING
= "MISSING";
84 static const char *NONCE_OK
= "OK";
85 static const char *NONCE_SLOP
= "SLOP";
86 static const char *nonce_status
;
87 static long nonce_stamp_slop
;
88 static timestamp_t nonce_stamp_slop_limit
;
89 static struct ref_transaction
*transaction
;
96 static int keepalive_in_sec
= 5;
98 static struct tmp_objdir
*tmp_objdir
;
100 static enum deny_action
parse_deny_action(const char *var
, const char *value
)
103 if (!strcasecmp(value
, "ignore"))
105 if (!strcasecmp(value
, "warn"))
107 if (!strcasecmp(value
, "refuse"))
109 if (!strcasecmp(value
, "updateinstead"))
110 return DENY_UPDATE_INSTEAD
;
112 if (git_config_bool(var
, value
))
117 static int receive_pack_config(const char *var
, const char *value
, void *cb
)
119 int status
= parse_hide_refs_config(var
, value
, "receive");
124 if (strcmp(var
, "receive.denydeletes") == 0) {
125 deny_deletes
= git_config_bool(var
, value
);
129 if (strcmp(var
, "receive.denynonfastforwards") == 0) {
130 deny_non_fast_forwards
= git_config_bool(var
, value
);
134 if (strcmp(var
, "receive.unpacklimit") == 0) {
135 receive_unpack_limit
= git_config_int(var
, value
);
139 if (strcmp(var
, "transfer.unpacklimit") == 0) {
140 transfer_unpack_limit
= git_config_int(var
, value
);
144 if (strcmp(var
, "receive.fsck.skiplist") == 0) {
147 if (git_config_pathname(&path
, var
, value
))
149 strbuf_addf(&fsck_msg_types
, "%cskiplist=%s",
150 fsck_msg_types
.len
? ',' : '=', path
);
155 if (skip_prefix(var
, "receive.fsck.", &var
)) {
156 if (is_valid_msg_type(var
, value
))
157 strbuf_addf(&fsck_msg_types
, "%c%s=%s",
158 fsck_msg_types
.len
? ',' : '=', var
, value
);
160 warning("Skipping unknown msg id '%s'", var
);
164 if (strcmp(var
, "receive.fsckobjects") == 0) {
165 receive_fsck_objects
= git_config_bool(var
, value
);
169 if (strcmp(var
, "transfer.fsckobjects") == 0) {
170 transfer_fsck_objects
= git_config_bool(var
, value
);
174 if (!strcmp(var
, "receive.denycurrentbranch")) {
175 deny_current_branch
= parse_deny_action(var
, value
);
179 if (strcmp(var
, "receive.denydeletecurrent") == 0) {
180 deny_delete_current
= parse_deny_action(var
, value
);
184 if (strcmp(var
, "repack.usedeltabaseoffset") == 0) {
185 prefer_ofs_delta
= git_config_bool(var
, value
);
189 if (strcmp(var
, "receive.updateserverinfo") == 0) {
190 auto_update_server_info
= git_config_bool(var
, value
);
194 if (strcmp(var
, "receive.autogc") == 0) {
195 auto_gc
= git_config_bool(var
, value
);
199 if (strcmp(var
, "receive.shallowupdate") == 0) {
200 shallow_update
= git_config_bool(var
, value
);
204 if (strcmp(var
, "receive.certnonceseed") == 0)
205 return git_config_string(&cert_nonce_seed
, var
, value
);
207 if (strcmp(var
, "receive.certnonceslop") == 0) {
208 nonce_stamp_slop_limit
= git_config_ulong(var
, value
);
212 if (strcmp(var
, "receive.advertiseatomic") == 0) {
213 advertise_atomic_push
= git_config_bool(var
, value
);
217 if (strcmp(var
, "receive.advertisepushoptions") == 0) {
218 advertise_push_options
= git_config_bool(var
, value
);
222 if (strcmp(var
, "receive.keepalive") == 0) {
223 keepalive_in_sec
= git_config_int(var
, value
);
227 if (strcmp(var
, "receive.maxinputsize") == 0) {
228 max_input_size
= git_config_int64(var
, value
);
232 return git_default_config(var
, value
, cb
);
235 static void show_ref(const char *path
, const struct object_id
*oid
)
237 if (sent_capabilities
) {
238 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid
), path
);
240 struct strbuf cap
= STRBUF_INIT
;
243 "report-status report-status-v2 delete-refs side-band-64k quiet");
244 if (advertise_atomic_push
)
245 strbuf_addstr(&cap
, " atomic");
246 if (prefer_ofs_delta
)
247 strbuf_addstr(&cap
, " ofs-delta");
249 strbuf_addf(&cap
, " push-cert=%s", push_cert_nonce
);
250 if (advertise_push_options
)
251 strbuf_addstr(&cap
, " push-options");
252 strbuf_addf(&cap
, " agent=%s", git_user_agent_sanitized());
253 packet_write_fmt(1, "%s %s%c%s\n",
254 oid_to_hex(oid
), path
, 0, cap
.buf
);
255 strbuf_release(&cap
);
256 sent_capabilities
= 1;
260 static int show_ref_cb(const char *path_full
, const struct object_id
*oid
,
261 int flag
, void *data
)
263 struct oidset
*seen
= data
;
264 const char *path
= strip_namespace(path_full
);
266 if (ref_is_hidden(path
, path_full
))
270 * Advertise refs outside our current namespace as ".have"
271 * refs, so that the client can use them to minimize data
272 * transfer but will otherwise ignore them.
275 if (oidset_insert(seen
, oid
))
279 oidset_insert(seen
, oid
);
285 static void show_one_alternate_ref(const struct object_id
*oid
,
288 struct oidset
*seen
= data
;
290 if (oidset_insert(seen
, oid
))
293 show_ref(".have", oid
);
296 static void write_head_info(void)
298 static struct oidset seen
= OIDSET_INIT
;
300 for_each_ref(show_ref_cb
, &seen
);
301 for_each_alternate_ref(show_one_alternate_ref
, &seen
);
303 if (!sent_capabilities
)
304 show_ref("capabilities^{}", &null_oid
);
306 advertise_shallow_grafts(1);
312 #define RUN_PROC_RECEIVE_SCHEDULED 1
313 #define RUN_PROC_RECEIVE_RETURNED 2
315 struct command
*next
;
316 const char *error_string
;
317 struct ref_push_report
*report
;
318 unsigned int skip_update
:1,
322 struct object_id old_oid
;
323 struct object_id new_oid
;
324 char ref_name
[FLEX_ARRAY
]; /* more */
327 static void rp_error(const char *err
, ...) __attribute__((format (printf
, 1, 2)));
328 static void rp_warning(const char *err
, ...) __attribute__((format (printf
, 1, 2)));
330 static void report_message(const char *prefix
, const char *err
, va_list params
)
335 sz
= xsnprintf(msg
, sizeof(msg
), "%s", prefix
);
336 sz
+= vsnprintf(msg
+ sz
, sizeof(msg
) - sz
, err
, params
);
337 if (sz
> (sizeof(msg
) - 1))
338 sz
= sizeof(msg
) - 1;
342 send_sideband(1, 2, msg
, sz
, use_sideband
);
347 static void rp_warning(const char *err
, ...)
350 va_start(params
, err
);
351 report_message("warning: ", err
, params
);
355 static void rp_error(const char *err
, ...)
358 va_start(params
, err
);
359 report_message("error: ", err
, params
);
363 static int copy_to_sideband(int in
, int out
, void *arg
)
366 int keepalive_active
= 0;
368 if (keepalive_in_sec
<= 0)
369 use_keepalive
= KEEPALIVE_NEVER
;
370 if (use_keepalive
== KEEPALIVE_ALWAYS
)
371 keepalive_active
= 1;
376 if (keepalive_active
) {
382 ret
= poll(&pfd
, 1, 1000 * keepalive_in_sec
);
389 } else if (ret
== 0) {
390 /* no data; send a keepalive packet */
391 static const char buf
[] = "0005\1";
392 write_or_die(1, buf
, sizeof(buf
) - 1);
394 } /* else there is actual data to read */
397 sz
= xread(in
, data
, sizeof(data
));
401 if (use_keepalive
== KEEPALIVE_AFTER_NUL
&& !keepalive_active
) {
402 const char *p
= memchr(data
, '\0', sz
);
405 * The NUL tells us to start sending keepalives. Make
406 * sure we send any other data we read along
409 keepalive_active
= 1;
410 send_sideband(1, 2, data
, p
- data
, use_sideband
);
411 send_sideband(1, 2, p
+ 1, sz
- (p
- data
+ 1), use_sideband
);
417 * Either we're not looking for a NUL signal, or we didn't see
418 * it yet; just pass along the data.
420 send_sideband(1, 2, data
, sz
, use_sideband
);
426 static void hmac(unsigned char *out
,
427 const char *key_in
, size_t key_len
,
428 const char *text
, size_t text_len
)
430 unsigned char key
[GIT_MAX_BLKSZ
];
431 unsigned char k_ipad
[GIT_MAX_BLKSZ
];
432 unsigned char k_opad
[GIT_MAX_BLKSZ
];
436 /* RFC 2104 2. (1) */
437 memset(key
, '\0', GIT_MAX_BLKSZ
);
438 if (the_hash_algo
->blksz
< key_len
) {
439 the_hash_algo
->init_fn(&ctx
);
440 the_hash_algo
->update_fn(&ctx
, key_in
, key_len
);
441 the_hash_algo
->final_fn(key
, &ctx
);
443 memcpy(key
, key_in
, key_len
);
446 /* RFC 2104 2. (2) & (5) */
447 for (i
= 0; i
< sizeof(key
); i
++) {
448 k_ipad
[i
] = key
[i
] ^ 0x36;
449 k_opad
[i
] = key
[i
] ^ 0x5c;
452 /* RFC 2104 2. (3) & (4) */
453 the_hash_algo
->init_fn(&ctx
);
454 the_hash_algo
->update_fn(&ctx
, k_ipad
, sizeof(k_ipad
));
455 the_hash_algo
->update_fn(&ctx
, text
, text_len
);
456 the_hash_algo
->final_fn(out
, &ctx
);
458 /* RFC 2104 2. (6) & (7) */
459 the_hash_algo
->init_fn(&ctx
);
460 the_hash_algo
->update_fn(&ctx
, k_opad
, sizeof(k_opad
));
461 the_hash_algo
->update_fn(&ctx
, out
, the_hash_algo
->rawsz
);
462 the_hash_algo
->final_fn(out
, &ctx
);
465 static char *prepare_push_cert_nonce(const char *path
, timestamp_t stamp
)
467 struct strbuf buf
= STRBUF_INIT
;
468 unsigned char hash
[GIT_MAX_RAWSZ
];
470 strbuf_addf(&buf
, "%s:%"PRItime
, path
, stamp
);
471 hmac(hash
, buf
.buf
, buf
.len
, cert_nonce_seed
, strlen(cert_nonce_seed
));
472 strbuf_release(&buf
);
474 /* RFC 2104 5. HMAC-SHA1-80 */
475 strbuf_addf(&buf
, "%"PRItime
"-%.*s", stamp
, (int)the_hash_algo
->hexsz
, hash_to_hex(hash
));
476 return strbuf_detach(&buf
, NULL
);
480 * NEEDSWORK: reuse find_commit_header() from jk/commit-author-parsing
481 * after dropping "_commit" from its name and possibly moving it out
484 static char *find_header(const char *msg
, size_t len
, const char *key
,
485 const char **next_line
)
487 int key_len
= strlen(key
);
488 const char *line
= msg
;
490 while (line
&& line
< msg
+ len
) {
491 const char *eol
= strchrnul(line
, '\n');
493 if ((msg
+ len
<= eol
) || line
== eol
)
495 if (line
+ key_len
< eol
&&
496 !memcmp(line
, key
, key_len
) && line
[key_len
] == ' ') {
497 int offset
= key_len
+ 1;
499 *next_line
= *eol
? eol
+ 1 : eol
;
500 return xmemdupz(line
+ offset
, (eol
- line
) - offset
);
502 line
= *eol
? eol
+ 1 : NULL
;
508 * Return zero if a and b are equal up to n bytes and nonzero if they are not.
509 * This operation is guaranteed to run in constant time to avoid leaking data.
511 static int constant_memequal(const char *a
, const char *b
, size_t n
)
516 for (i
= 0; i
< n
; i
++)
521 static const char *check_nonce(const char *buf
, size_t len
)
523 char *nonce
= find_header(buf
, len
, "nonce", NULL
);
524 timestamp_t stamp
, ostamp
;
525 char *bohmac
, *expect
= NULL
;
526 const char *retval
= NONCE_BAD
;
530 retval
= NONCE_MISSING
;
532 } else if (!push_cert_nonce
) {
533 retval
= NONCE_UNSOLICITED
;
535 } else if (!strcmp(push_cert_nonce
, nonce
)) {
540 if (!stateless_rpc
) {
541 /* returned nonce MUST match what we gave out earlier */
547 * In stateless mode, we may be receiving a nonce issued by
548 * another instance of the server that serving the same
549 * repository, and the timestamps may not match, but the
550 * nonce-seed and dir should match, so we can recompute and
551 * report the time slop.
553 * In addition, when a nonce issued by another instance has
554 * timestamp within receive.certnonceslop seconds, we pretend
555 * as if we issued that nonce when reporting to the hook.
558 /* nonce is concat(<seconds-since-epoch>, "-", <hmac>) */
559 if (*nonce
<= '0' || '9' < *nonce
) {
563 stamp
= parse_timestamp(nonce
, &bohmac
, 10);
564 if (bohmac
== nonce
|| bohmac
[0] != '-') {
569 noncelen
= strlen(nonce
);
570 expect
= prepare_push_cert_nonce(service_dir
, stamp
);
571 if (noncelen
!= strlen(expect
)) {
572 /* This is not even the right size. */
576 if (constant_memequal(expect
, nonce
, noncelen
)) {
577 /* Not what we would have signed earlier */
583 * By how many seconds is this nonce stale? Negative value
584 * would mean it was issued by another server with its clock
585 * skewed in the future.
587 ostamp
= parse_timestamp(push_cert_nonce
, NULL
, 10);
588 nonce_stamp_slop
= (long)ostamp
- (long)stamp
;
590 if (nonce_stamp_slop_limit
&&
591 labs(nonce_stamp_slop
) <= nonce_stamp_slop_limit
) {
593 * Pretend as if the received nonce (which passes the
594 * HMAC check, so it is not a forged by third-party)
597 free((void *)push_cert_nonce
);
598 push_cert_nonce
= xstrdup(nonce
);
611 * Return 1 if there is no push_cert or if the push options in push_cert are
612 * the same as those in the argument; 0 otherwise.
614 static int check_cert_push_options(const struct string_list
*push_options
)
616 const char *buf
= push_cert
.buf
;
617 int len
= push_cert
.len
;
620 const char *next_line
;
621 int options_seen
= 0;
628 while ((option
= find_header(buf
, len
, "push-option", &next_line
))) {
629 len
-= (next_line
- buf
);
632 if (options_seen
> push_options
->nr
634 push_options
->items
[options_seen
- 1].string
)) {
641 if (options_seen
!= push_options
->nr
)
649 static void prepare_push_cert_sha1(struct child_process
*proc
)
651 static int already_done
;
657 int bogs
/* beginning_of_gpg_sig */;
660 if (write_object_file(push_cert
.buf
, push_cert
.len
, "blob",
662 oidclr(&push_cert_oid
);
664 memset(&sigcheck
, '\0', sizeof(sigcheck
));
666 bogs
= parse_signature(push_cert
.buf
, push_cert
.len
);
667 check_signature(push_cert
.buf
, bogs
, push_cert
.buf
+ bogs
,
668 push_cert
.len
- bogs
, &sigcheck
);
670 nonce_status
= check_nonce(push_cert
.buf
, bogs
);
672 if (!is_null_oid(&push_cert_oid
)) {
673 argv_array_pushf(&proc
->env_array
, "GIT_PUSH_CERT=%s",
674 oid_to_hex(&push_cert_oid
));
675 argv_array_pushf(&proc
->env_array
, "GIT_PUSH_CERT_SIGNER=%s",
676 sigcheck
.signer
? sigcheck
.signer
: "");
677 argv_array_pushf(&proc
->env_array
, "GIT_PUSH_CERT_KEY=%s",
678 sigcheck
.key
? sigcheck
.key
: "");
679 argv_array_pushf(&proc
->env_array
, "GIT_PUSH_CERT_STATUS=%c",
681 if (push_cert_nonce
) {
682 argv_array_pushf(&proc
->env_array
,
683 "GIT_PUSH_CERT_NONCE=%s",
685 argv_array_pushf(&proc
->env_array
,
686 "GIT_PUSH_CERT_NONCE_STATUS=%s",
688 if (nonce_status
== NONCE_SLOP
)
689 argv_array_pushf(&proc
->env_array
,
690 "GIT_PUSH_CERT_NONCE_SLOP=%ld",
696 struct receive_hook_feed_state
{
698 struct ref_push_report
*report
;
701 const struct string_list
*push_options
;
704 typedef int (*feed_fn
)(void *, const char **, size_t *);
705 static int run_and_feed_hook(const char *hook_name
, feed_fn feed
,
706 struct receive_hook_feed_state
*feed_state
)
708 struct child_process proc
= CHILD_PROCESS_INIT
;
713 argv
[0] = find_hook(hook_name
);
721 proc
.stdout_to_stderr
= 1;
722 proc
.trace2_hook_name
= hook_name
;
724 if (feed_state
->push_options
) {
726 for (i
= 0; i
< feed_state
->push_options
->nr
; i
++)
727 argv_array_pushf(&proc
.env_array
,
728 "GIT_PUSH_OPTION_%d=%s", i
,
729 feed_state
->push_options
->items
[i
].string
);
730 argv_array_pushf(&proc
.env_array
, "GIT_PUSH_OPTION_COUNT=%d",
731 feed_state
->push_options
->nr
);
733 argv_array_pushf(&proc
.env_array
, "GIT_PUSH_OPTION_COUNT");
736 argv_array_pushv(&proc
.env_array
, tmp_objdir_env(tmp_objdir
));
739 memset(&muxer
, 0, sizeof(muxer
));
740 muxer
.proc
= copy_to_sideband
;
742 code
= start_async(&muxer
);
748 prepare_push_cert_sha1(&proc
);
750 code
= start_command(&proc
);
753 finish_async(&muxer
);
757 sigchain_push(SIGPIPE
, SIG_IGN
);
762 if (feed(feed_state
, &buf
, &n
))
764 if (write_in_full(proc
.in
, buf
, n
) < 0)
769 finish_async(&muxer
);
771 sigchain_pop(SIGPIPE
);
773 return finish_command(&proc
);
776 static int feed_receive_hook(void *state_
, const char **bufp
, size_t *sizep
)
778 struct receive_hook_feed_state
*state
= state_
;
779 struct command
*cmd
= state
->cmd
;
782 state
->skip_broken
&& (cmd
->error_string
|| cmd
->did_not_exist
))
787 return 0; /* OK, can feed something. */
788 strbuf_reset(&state
->buf
);
790 state
->report
= cmd
->report
;
792 struct object_id
*old_oid
;
793 struct object_id
*new_oid
;
794 const char *ref_name
;
796 old_oid
= state
->report
->old_oid
? state
->report
->old_oid
: &cmd
->old_oid
;
797 new_oid
= state
->report
->new_oid
? state
->report
->new_oid
: &cmd
->new_oid
;
798 ref_name
= state
->report
->ref_name
? state
->report
->ref_name
: cmd
->ref_name
;
799 strbuf_addf(&state
->buf
, "%s %s %s\n",
800 oid_to_hex(old_oid
), oid_to_hex(new_oid
),
802 state
->report
= state
->report
->next
;
804 state
->cmd
= cmd
->next
;
806 strbuf_addf(&state
->buf
, "%s %s %s\n",
807 oid_to_hex(&cmd
->old_oid
), oid_to_hex(&cmd
->new_oid
),
809 state
->cmd
= cmd
->next
;
812 *bufp
= state
->buf
.buf
;
813 *sizep
= state
->buf
.len
;
818 static int run_receive_hook(struct command
*commands
,
819 const char *hook_name
,
821 const struct string_list
*push_options
)
823 struct receive_hook_feed_state state
;
826 strbuf_init(&state
.buf
, 0);
827 state
.cmd
= commands
;
828 state
.skip_broken
= skip_broken
;
830 if (feed_receive_hook(&state
, NULL
, NULL
))
832 state
.cmd
= commands
;
833 state
.push_options
= push_options
;
834 status
= run_and_feed_hook(hook_name
, feed_receive_hook
, &state
);
835 strbuf_release(&state
.buf
);
839 static int run_update_hook(struct command
*cmd
)
842 struct child_process proc
= CHILD_PROCESS_INIT
;
845 argv
[0] = find_hook("update");
849 argv
[1] = cmd
->ref_name
;
850 argv
[2] = oid_to_hex(&cmd
->old_oid
);
851 argv
[3] = oid_to_hex(&cmd
->new_oid
);
855 proc
.stdout_to_stderr
= 1;
856 proc
.err
= use_sideband
? -1 : 0;
858 proc
.trace2_hook_name
= "update";
860 code
= start_command(&proc
);
864 copy_to_sideband(proc
.err
, -1, NULL
);
865 return finish_command(&proc
);
868 static struct command
*find_command_by_refname(struct command
*list
,
871 for (; list
; list
= list
->next
)
872 if (!strcmp(list
->ref_name
, refname
))
877 static int read_proc_receive_report(struct packet_reader
*reader
,
878 struct command
*commands
,
879 struct strbuf
*errmsg
)
882 struct command
*hint
= NULL
;
883 struct ref_push_report
*report
= NULL
;
889 struct object_id old_oid
, new_oid
;
894 if (packet_reader_read(reader
) != PACKET_READ_NORMAL
)
898 p
= strchr(head
, ' ');
900 strbuf_addf(errmsg
, "proc-receive reported incomplete status line: '%s'\n", head
);
905 if (!strcmp(head
, "option")) {
906 const char *key
, *val
;
908 if (!hint
|| !(report
|| new_report
)) {
910 strbuf_addstr(errmsg
, "proc-receive reported 'option' without a matching 'ok/ng' directive\n");
916 hint
->report
= xcalloc(1, sizeof(struct ref_push_report
));
917 report
= hint
->report
;
919 report
= hint
->report
;
921 report
= report
->next
;
922 report
->next
= xcalloc(1, sizeof(struct ref_push_report
));
923 report
= report
->next
;
928 p
= strchr(key
, ' ');
932 if (!strcmp(key
, "refname"))
933 report
->ref_name
= xstrdup_or_null(val
);
934 else if (!strcmp(key
, "old-oid") && val
&&
935 !parse_oid_hex(val
, &old_oid
, &val
))
936 report
->old_oid
= oiddup(&old_oid
);
937 else if (!strcmp(key
, "new-oid") && val
&&
938 !parse_oid_hex(val
, &new_oid
, &val
))
939 report
->new_oid
= oiddup(&new_oid
);
940 else if (!strcmp(key
, "forced-update"))
941 report
->forced_update
= 1;
942 else if (!strcmp(key
, "fall-through"))
943 /* Fall through, let 'receive-pack' to execute it. */
944 hint
->run_proc_receive
= 0;
951 p
= strchr(refname
, ' ');
954 if (strcmp(head
, "ok") && strcmp(head
, "ng")) {
955 strbuf_addf(errmsg
, "proc-receive reported bad status '%s' on ref '%s'\n",
961 /* first try searching at our hint, falling back to all refs */
963 hint
= find_command_by_refname(hint
, refname
);
965 hint
= find_command_by_refname(commands
, refname
);
967 strbuf_addf(errmsg
, "proc-receive reported status on unknown ref: %s\n",
972 if (!hint
->run_proc_receive
) {
973 strbuf_addf(errmsg
, "proc-receive reported status on unexpected ref: %s\n",
978 hint
->run_proc_receive
|= RUN_PROC_RECEIVE_RETURNED
;
979 if (!strcmp(head
, "ng")) {
981 hint
->error_string
= xstrdup(p
);
983 hint
->error_string
= "failed";
990 for (cmd
= commands
; cmd
; cmd
= cmd
->next
)
991 if (cmd
->run_proc_receive
&& !cmd
->error_string
&&
992 !(cmd
->run_proc_receive
& RUN_PROC_RECEIVE_RETURNED
)) {
993 cmd
->error_string
= "proc-receive failed to report status";
999 static int run_proc_receive_hook(struct command
*commands
,
1000 const struct string_list
*push_options
)
1002 struct child_process proc
= CHILD_PROCESS_INIT
;
1004 struct command
*cmd
;
1005 const char *argv
[2];
1006 struct packet_reader reader
;
1007 struct strbuf cap
= STRBUF_INIT
;
1008 struct strbuf errmsg
= STRBUF_INIT
;
1009 int hook_use_push_options
= 0;
1013 argv
[0] = find_hook("proc-receive");
1015 rp_error("cannot find hook 'proc-receive'");
1023 proc
.trace2_hook_name
= "proc-receive";
1026 memset(&muxer
, 0, sizeof(muxer
));
1027 muxer
.proc
= copy_to_sideband
;
1029 code
= start_async(&muxer
);
1032 proc
.err
= muxer
.in
;
1037 code
= start_command(&proc
);
1040 finish_async(&muxer
);
1044 sigchain_push(SIGPIPE
, SIG_IGN
);
1046 /* Version negotiaton */
1047 packet_reader_init(&reader
, proc
.out
, NULL
, 0,
1048 PACKET_READ_CHOMP_NEWLINE
|
1049 PACKET_READ_GENTLE_ON_EOF
);
1051 strbuf_addstr(&cap
, " atomic");
1052 if (use_push_options
)
1053 strbuf_addstr(&cap
, " push-options");
1055 packet_write_fmt(proc
.in
, "version=1%c%s\n", '\0', cap
.buf
+ 1);
1056 strbuf_release(&cap
);
1058 packet_write_fmt(proc
.in
, "version=1\n");
1060 packet_flush(proc
.in
);
1065 if (packet_reader_read(&reader
) != PACKET_READ_NORMAL
)
1068 if (reader
.pktlen
> 8 && starts_with(reader
.line
, "version=")) {
1069 version
= atoi(reader
.line
+ 8);
1070 linelen
= strlen(reader
.line
);
1071 if (linelen
< reader
.pktlen
) {
1072 const char *feature_list
= reader
.line
+ linelen
+ 1;
1073 if (parse_feature_request(feature_list
, "push-options"))
1074 hook_use_push_options
= 1;
1080 strbuf_addf(&errmsg
, "proc-receive version '%d' is not supported",
1087 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1088 if (!cmd
->run_proc_receive
|| cmd
->skip_update
|| cmd
->error_string
)
1090 packet_write_fmt(proc
.in
, "%s %s %s",
1091 oid_to_hex(&cmd
->old_oid
),
1092 oid_to_hex(&cmd
->new_oid
),
1095 packet_flush(proc
.in
);
1097 /* Send push options */
1098 if (hook_use_push_options
) {
1099 struct string_list_item
*item
;
1101 for_each_string_list_item(item
, push_options
)
1102 packet_write_fmt(proc
.in
, "%s", item
->string
);
1103 packet_flush(proc
.in
);
1106 /* Read result from proc-receive */
1107 code
= read_proc_receive_report(&reader
, commands
, &errmsg
);
1113 finish_async(&muxer
);
1114 if (finish_command(&proc
))
1116 if (errmsg
.len
>0) {
1117 char *p
= errmsg
.buf
;
1119 p
+= errmsg
.len
- 1;
1122 rp_error("%s", errmsg
.buf
);
1123 strbuf_release(&errmsg
);
1125 sigchain_pop(SIGPIPE
);
1130 static char *refuse_unconfigured_deny_msg
=
1131 N_("By default, updating the current branch in a non-bare repository\n"
1132 "is denied, because it will make the index and work tree inconsistent\n"
1133 "with what you pushed, and will require 'git reset --hard' to match\n"
1134 "the work tree to HEAD.\n"
1136 "You can set the 'receive.denyCurrentBranch' configuration variable\n"
1137 "to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
1138 "its current branch; however, this is not recommended unless you\n"
1139 "arranged to update its work tree to match what you pushed in some\n"
1142 "To squelch this message and still keep the default behaviour, set\n"
1143 "'receive.denyCurrentBranch' configuration variable to 'refuse'.");
1145 static void refuse_unconfigured_deny(void)
1147 rp_error("%s", _(refuse_unconfigured_deny_msg
));
1150 static char *refuse_unconfigured_deny_delete_current_msg
=
1151 N_("By default, deleting the current branch is denied, because the next\n"
1152 "'git clone' won't result in any file checked out, causing confusion.\n"
1154 "You can set 'receive.denyDeleteCurrent' configuration variable to\n"
1155 "'warn' or 'ignore' in the remote repository to allow deleting the\n"
1156 "current branch, with or without a warning message.\n"
1158 "To squelch this message, you can set it to 'refuse'.");
1160 static void refuse_unconfigured_deny_delete_current(void)
1162 rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg
));
1165 static int command_singleton_iterator(void *cb_data
, struct object_id
*oid
);
1166 static int update_shallow_ref(struct command
*cmd
, struct shallow_info
*si
)
1168 struct lock_file shallow_lock
= LOCK_INIT
;
1169 struct oid_array extra
= OID_ARRAY_INIT
;
1170 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1171 uint32_t mask
= 1 << (cmd
->index
% 32);
1174 trace_printf_key(&trace_shallow
,
1175 "shallow: update_shallow_ref %s\n", cmd
->ref_name
);
1176 for (i
= 0; i
< si
->shallow
->nr
; i
++)
1177 if (si
->used_shallow
[i
] &&
1178 (si
->used_shallow
[i
][cmd
->index
/ 32] & mask
) &&
1179 !delayed_reachability_test(si
, i
))
1180 oid_array_append(&extra
, &si
->shallow
->oid
[i
]);
1182 opt
.env
= tmp_objdir_env(tmp_objdir
);
1183 setup_alternate_shallow(&shallow_lock
, &opt
.shallow_file
, &extra
);
1184 if (check_connected(command_singleton_iterator
, cmd
, &opt
)) {
1185 rollback_shallow_file(the_repository
, &shallow_lock
);
1186 oid_array_clear(&extra
);
1190 commit_shallow_file(the_repository
, &shallow_lock
);
1193 * Make sure setup_alternate_shallow() for the next ref does
1194 * not lose these new roots..
1196 for (i
= 0; i
< extra
.nr
; i
++)
1197 register_shallow(the_repository
, &extra
.oid
[i
]);
1199 si
->shallow_ref
[cmd
->index
] = 0;
1200 oid_array_clear(&extra
);
1205 * NEEDSWORK: we should consolidate various implementions of "are we
1206 * on an unborn branch?" test into one, and make the unified one more
1207 * robust. !get_sha1() based check used here and elsewhere would not
1208 * allow us to tell an unborn branch from corrupt ref, for example.
1209 * For the purpose of fixing "deploy-to-update does not work when
1210 * pushing into an empty repository" issue, this should suffice for
1213 static int head_has_history(void)
1215 struct object_id oid
;
1217 return !get_oid("HEAD", &oid
);
1220 static const char *push_to_deploy(unsigned char *sha1
,
1221 struct argv_array
*env
,
1222 const char *work_tree
)
1224 const char *update_refresh
[] = {
1225 "update-index", "-q", "--ignore-submodules", "--refresh", NULL
1227 const char *diff_files
[] = {
1228 "diff-files", "--quiet", "--ignore-submodules", "--", NULL
1230 const char *diff_index
[] = {
1231 "diff-index", "--quiet", "--cached", "--ignore-submodules",
1234 const char *read_tree
[] = {
1235 "read-tree", "-u", "-m", NULL
, NULL
1237 struct child_process child
= CHILD_PROCESS_INIT
;
1239 child
.argv
= update_refresh
;
1240 child
.env
= env
->argv
;
1241 child
.dir
= work_tree
;
1243 child
.stdout_to_stderr
= 1;
1245 if (run_command(&child
))
1246 return "Up-to-date check failed";
1248 /* run_command() does not clean up completely; reinitialize */
1249 child_process_init(&child
);
1250 child
.argv
= diff_files
;
1251 child
.env
= env
->argv
;
1252 child
.dir
= work_tree
;
1254 child
.stdout_to_stderr
= 1;
1256 if (run_command(&child
))
1257 return "Working directory has unstaged changes";
1259 /* diff-index with either HEAD or an empty tree */
1260 diff_index
[4] = head_has_history() ? "HEAD" : empty_tree_oid_hex();
1262 child_process_init(&child
);
1263 child
.argv
= diff_index
;
1264 child
.env
= env
->argv
;
1266 child
.no_stdout
= 1;
1267 child
.stdout_to_stderr
= 0;
1269 if (run_command(&child
))
1270 return "Working directory has staged changes";
1272 read_tree
[3] = hash_to_hex(sha1
);
1273 child_process_init(&child
);
1274 child
.argv
= read_tree
;
1275 child
.env
= env
->argv
;
1276 child
.dir
= work_tree
;
1278 child
.no_stdout
= 1;
1279 child
.stdout_to_stderr
= 0;
1281 if (run_command(&child
))
1282 return "Could not update working tree to new HEAD";
1287 static const char *push_to_checkout_hook
= "push-to-checkout";
1289 static const char *push_to_checkout(unsigned char *hash
,
1290 struct argv_array
*env
,
1291 const char *work_tree
)
1293 argv_array_pushf(env
, "GIT_WORK_TREE=%s", absolute_path(work_tree
));
1294 if (run_hook_le(env
->argv
, push_to_checkout_hook
,
1295 hash_to_hex(hash
), NULL
))
1296 return "push-to-checkout hook declined";
1301 static const char *update_worktree(unsigned char *sha1
, const struct worktree
*worktree
)
1303 const char *retval
, *work_tree
, *git_dir
= NULL
;
1304 struct argv_array env
= ARGV_ARRAY_INIT
;
1306 if (worktree
&& worktree
->path
)
1307 work_tree
= worktree
->path
;
1308 else if (git_work_tree_cfg
)
1309 work_tree
= git_work_tree_cfg
;
1313 if (is_bare_repository())
1314 return "denyCurrentBranch = updateInstead needs a worktree";
1316 git_dir
= get_worktree_git_dir(worktree
);
1318 git_dir
= get_git_dir();
1320 argv_array_pushf(&env
, "GIT_DIR=%s", absolute_path(git_dir
));
1322 if (!find_hook(push_to_checkout_hook
))
1323 retval
= push_to_deploy(sha1
, &env
, work_tree
);
1325 retval
= push_to_checkout(sha1
, &env
, work_tree
);
1327 argv_array_clear(&env
);
1331 static const char *update(struct command
*cmd
, struct shallow_info
*si
)
1333 const char *name
= cmd
->ref_name
;
1334 struct strbuf namespaced_name_buf
= STRBUF_INIT
;
1335 static char *namespaced_name
;
1337 struct object_id
*old_oid
= &cmd
->old_oid
;
1338 struct object_id
*new_oid
= &cmd
->new_oid
;
1339 int do_update_worktree
= 0;
1340 const struct worktree
*worktree
= is_bare_repository() ? NULL
: find_shared_symref("HEAD", name
);
1342 /* only refs/... are allowed */
1343 if (!starts_with(name
, "refs/") || check_refname_format(name
+ 5, 0)) {
1344 rp_error("refusing to create funny ref '%s' remotely", name
);
1345 return "funny refname";
1348 strbuf_addf(&namespaced_name_buf
, "%s%s", get_git_namespace(), name
);
1349 free(namespaced_name
);
1350 namespaced_name
= strbuf_detach(&namespaced_name_buf
, NULL
);
1353 switch (deny_current_branch
) {
1357 rp_warning("updating the current branch");
1360 case DENY_UNCONFIGURED
:
1361 rp_error("refusing to update checked out branch: %s", name
);
1362 if (deny_current_branch
== DENY_UNCONFIGURED
)
1363 refuse_unconfigured_deny();
1364 return "branch is currently checked out";
1365 case DENY_UPDATE_INSTEAD
:
1366 /* pass -- let other checks intervene first */
1367 do_update_worktree
= 1;
1372 if (!is_null_oid(new_oid
) && !has_object_file(new_oid
)) {
1373 error("unpack should have generated %s, "
1374 "but I can't find it!", oid_to_hex(new_oid
));
1378 if (!is_null_oid(old_oid
) && is_null_oid(new_oid
)) {
1379 if (deny_deletes
&& starts_with(name
, "refs/heads/")) {
1380 rp_error("denying ref deletion for %s", name
);
1381 return "deletion prohibited";
1384 if (worktree
|| (head_name
&& !strcmp(namespaced_name
, head_name
))) {
1385 switch (deny_delete_current
) {
1389 rp_warning("deleting the current branch");
1392 case DENY_UNCONFIGURED
:
1393 case DENY_UPDATE_INSTEAD
:
1394 if (deny_delete_current
== DENY_UNCONFIGURED
)
1395 refuse_unconfigured_deny_delete_current();
1396 rp_error("refusing to delete the current branch: %s", name
);
1397 return "deletion of the current branch prohibited";
1399 return "Invalid denyDeleteCurrent setting";
1404 if (deny_non_fast_forwards
&& !is_null_oid(new_oid
) &&
1405 !is_null_oid(old_oid
) &&
1406 starts_with(name
, "refs/heads/")) {
1407 struct object
*old_object
, *new_object
;
1408 struct commit
*old_commit
, *new_commit
;
1410 old_object
= parse_object(the_repository
, old_oid
);
1411 new_object
= parse_object(the_repository
, new_oid
);
1413 if (!old_object
|| !new_object
||
1414 old_object
->type
!= OBJ_COMMIT
||
1415 new_object
->type
!= OBJ_COMMIT
) {
1416 error("bad sha1 objects for %s", name
);
1419 old_commit
= (struct commit
*)old_object
;
1420 new_commit
= (struct commit
*)new_object
;
1421 if (!in_merge_bases(old_commit
, new_commit
)) {
1422 rp_error("denying non-fast-forward %s"
1423 " (you should pull first)", name
);
1424 return "non-fast-forward";
1427 if (run_update_hook(cmd
)) {
1428 rp_error("hook declined to update %s", name
);
1429 return "hook declined";
1432 if (do_update_worktree
) {
1433 ret
= update_worktree(new_oid
->hash
, find_shared_symref("HEAD", name
));
1438 if (is_null_oid(new_oid
)) {
1439 struct strbuf err
= STRBUF_INIT
;
1440 if (!parse_object(the_repository
, old_oid
)) {
1442 if (ref_exists(name
)) {
1443 rp_warning("Allowing deletion of corrupt ref.");
1445 rp_warning("Deleting a non-existent ref.");
1446 cmd
->did_not_exist
= 1;
1449 if (ref_transaction_delete(transaction
,
1453 rp_error("%s", err
.buf
);
1454 strbuf_release(&err
);
1455 return "failed to delete";
1457 strbuf_release(&err
);
1458 return NULL
; /* good */
1461 struct strbuf err
= STRBUF_INIT
;
1462 if (shallow_update
&& si
->shallow_ref
[cmd
->index
] &&
1463 update_shallow_ref(cmd
, si
))
1464 return "shallow error";
1466 if (ref_transaction_update(transaction
,
1471 rp_error("%s", err
.buf
);
1472 strbuf_release(&err
);
1474 return "failed to update ref";
1476 strbuf_release(&err
);
1478 return NULL
; /* good */
1482 static void run_update_post_hook(struct command
*commands
)
1484 struct command
*cmd
;
1485 struct child_process proc
= CHILD_PROCESS_INIT
;
1488 hook
= find_hook("post-update");
1492 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1493 if (cmd
->error_string
|| cmd
->did_not_exist
)
1495 if (!proc
.args
.argc
)
1496 argv_array_push(&proc
.args
, hook
);
1497 argv_array_push(&proc
.args
, cmd
->ref_name
);
1499 if (!proc
.args
.argc
)
1503 proc
.stdout_to_stderr
= 1;
1504 proc
.err
= use_sideband
? -1 : 0;
1505 proc
.trace2_hook_name
= "post-update";
1507 if (!start_command(&proc
)) {
1509 copy_to_sideband(proc
.err
, -1, NULL
);
1510 finish_command(&proc
);
1514 static void check_aliased_update_internal(struct command
*cmd
,
1515 struct string_list
*list
,
1516 const char *dst_name
, int flag
)
1518 struct string_list_item
*item
;
1519 struct command
*dst_cmd
;
1521 if (!(flag
& REF_ISSYMREF
))
1525 rp_error("refusing update to broken symref '%s'", cmd
->ref_name
);
1526 cmd
->skip_update
= 1;
1527 cmd
->error_string
= "broken symref";
1530 dst_name
= strip_namespace(dst_name
);
1532 if ((item
= string_list_lookup(list
, dst_name
)) == NULL
)
1535 cmd
->skip_update
= 1;
1537 dst_cmd
= (struct command
*) item
->util
;
1539 if (oideq(&cmd
->old_oid
, &dst_cmd
->old_oid
) &&
1540 oideq(&cmd
->new_oid
, &dst_cmd
->new_oid
))
1543 dst_cmd
->skip_update
= 1;
1545 rp_error("refusing inconsistent update between symref '%s' (%s..%s) and"
1546 " its target '%s' (%s..%s)",
1548 find_unique_abbrev(&cmd
->old_oid
, DEFAULT_ABBREV
),
1549 find_unique_abbrev(&cmd
->new_oid
, DEFAULT_ABBREV
),
1551 find_unique_abbrev(&dst_cmd
->old_oid
, DEFAULT_ABBREV
),
1552 find_unique_abbrev(&dst_cmd
->new_oid
, DEFAULT_ABBREV
));
1554 cmd
->error_string
= dst_cmd
->error_string
=
1555 "inconsistent aliased update";
1558 static void check_aliased_update(struct command
*cmd
, struct string_list
*list
)
1560 struct strbuf buf
= STRBUF_INIT
;
1561 const char *dst_name
;
1564 strbuf_addf(&buf
, "%s%s", get_git_namespace(), cmd
->ref_name
);
1565 dst_name
= resolve_ref_unsafe(buf
.buf
, 0, NULL
, &flag
);
1566 check_aliased_update_internal(cmd
, list
, dst_name
, flag
);
1567 strbuf_release(&buf
);
1570 static void check_aliased_updates(struct command
*commands
)
1572 struct command
*cmd
;
1573 struct string_list ref_list
= STRING_LIST_INIT_NODUP
;
1575 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1576 struct string_list_item
*item
=
1577 string_list_append(&ref_list
, cmd
->ref_name
);
1578 item
->util
= (void *)cmd
;
1580 string_list_sort(&ref_list
);
1582 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1583 if (!cmd
->error_string
)
1584 check_aliased_update(cmd
, &ref_list
);
1587 string_list_clear(&ref_list
, 0);
1590 static int command_singleton_iterator(void *cb_data
, struct object_id
*oid
)
1592 struct command
**cmd_list
= cb_data
;
1593 struct command
*cmd
= *cmd_list
;
1595 if (!cmd
|| is_null_oid(&cmd
->new_oid
))
1596 return -1; /* end of list */
1597 *cmd_list
= NULL
; /* this returns only one */
1598 oidcpy(oid
, &cmd
->new_oid
);
1602 static void set_connectivity_errors(struct command
*commands
,
1603 struct shallow_info
*si
)
1605 struct command
*cmd
;
1607 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1608 struct command
*singleton
= cmd
;
1609 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1611 if (shallow_update
&& si
->shallow_ref
[cmd
->index
])
1612 /* to be checked in update_shallow_ref() */
1615 opt
.env
= tmp_objdir_env(tmp_objdir
);
1616 if (!check_connected(command_singleton_iterator
, &singleton
,
1620 cmd
->error_string
= "missing necessary objects";
1624 struct iterate_data
{
1625 struct command
*cmds
;
1626 struct shallow_info
*si
;
1629 static int iterate_receive_command_list(void *cb_data
, struct object_id
*oid
)
1631 struct iterate_data
*data
= cb_data
;
1632 struct command
**cmd_list
= &data
->cmds
;
1633 struct command
*cmd
= *cmd_list
;
1635 for (; cmd
; cmd
= cmd
->next
) {
1636 if (shallow_update
&& data
->si
->shallow_ref
[cmd
->index
])
1637 /* to be checked in update_shallow_ref() */
1639 if (!is_null_oid(&cmd
->new_oid
) && !cmd
->skip_update
) {
1640 oidcpy(oid
, &cmd
->new_oid
);
1641 *cmd_list
= cmd
->next
;
1646 return -1; /* end of list */
1649 static void reject_updates_to_hidden(struct command
*commands
)
1651 struct strbuf refname_full
= STRBUF_INIT
;
1653 struct command
*cmd
;
1655 strbuf_addstr(&refname_full
, get_git_namespace());
1656 prefix_len
= refname_full
.len
;
1658 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1659 if (cmd
->error_string
)
1662 strbuf_setlen(&refname_full
, prefix_len
);
1663 strbuf_addstr(&refname_full
, cmd
->ref_name
);
1665 if (!ref_is_hidden(cmd
->ref_name
, refname_full
.buf
))
1667 if (is_null_oid(&cmd
->new_oid
))
1668 cmd
->error_string
= "deny deleting a hidden ref";
1670 cmd
->error_string
= "deny updating a hidden ref";
1673 strbuf_release(&refname_full
);
1676 static int should_process_cmd(struct command
*cmd
)
1678 return !cmd
->error_string
&& !cmd
->skip_update
;
1681 static void warn_if_skipped_connectivity_check(struct command
*commands
,
1682 struct shallow_info
*si
)
1684 struct command
*cmd
;
1685 int checked_connectivity
= 1;
1687 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1688 if (should_process_cmd(cmd
) && si
->shallow_ref
[cmd
->index
]) {
1689 error("BUG: connectivity check has not been run on ref %s",
1691 checked_connectivity
= 0;
1694 if (!checked_connectivity
)
1695 BUG("connectivity check skipped???");
1698 static void execute_commands_non_atomic(struct command
*commands
,
1699 struct shallow_info
*si
)
1701 struct command
*cmd
;
1702 struct strbuf err
= STRBUF_INIT
;
1704 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1705 if (!should_process_cmd(cmd
) || cmd
->run_proc_receive
)
1708 transaction
= ref_transaction_begin(&err
);
1710 rp_error("%s", err
.buf
);
1712 cmd
->error_string
= "transaction failed to start";
1716 cmd
->error_string
= update(cmd
, si
);
1718 if (!cmd
->error_string
1719 && ref_transaction_commit(transaction
, &err
)) {
1720 rp_error("%s", err
.buf
);
1722 cmd
->error_string
= "failed to update ref";
1724 ref_transaction_free(transaction
);
1726 strbuf_release(&err
);
1729 static void execute_commands_atomic(struct command
*commands
,
1730 struct shallow_info
*si
)
1732 struct command
*cmd
;
1733 struct strbuf err
= STRBUF_INIT
;
1734 const char *reported_error
= "atomic push failure";
1736 transaction
= ref_transaction_begin(&err
);
1738 rp_error("%s", err
.buf
);
1740 reported_error
= "transaction failed to start";
1744 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1745 if (!should_process_cmd(cmd
) || cmd
->run_proc_receive
)
1748 cmd
->error_string
= update(cmd
, si
);
1750 if (cmd
->error_string
)
1754 if (ref_transaction_commit(transaction
, &err
)) {
1755 rp_error("%s", err
.buf
);
1756 reported_error
= "atomic transaction failed";
1762 for (cmd
= commands
; cmd
; cmd
= cmd
->next
)
1763 if (!cmd
->error_string
)
1764 cmd
->error_string
= reported_error
;
1767 ref_transaction_free(transaction
);
1768 strbuf_release(&err
);
1771 static void execute_commands(struct command
*commands
,
1772 const char *unpacker_error
,
1773 struct shallow_info
*si
,
1774 const struct string_list
*push_options
)
1776 struct check_connected_options opt
= CHECK_CONNECTED_INIT
;
1777 struct command
*cmd
;
1778 struct iterate_data data
;
1781 int run_proc_receive
= 0;
1783 if (unpacker_error
) {
1784 for (cmd
= commands
; cmd
; cmd
= cmd
->next
)
1785 cmd
->error_string
= "unpacker error";
1790 memset(&muxer
, 0, sizeof(muxer
));
1791 muxer
.proc
= copy_to_sideband
;
1793 if (!start_async(&muxer
))
1795 /* ...else, continue without relaying sideband */
1798 data
.cmds
= commands
;
1800 opt
.err_fd
= err_fd
;
1801 opt
.progress
= err_fd
&& !quiet
;
1802 opt
.env
= tmp_objdir_env(tmp_objdir
);
1803 if (check_connected(iterate_receive_command_list
, &data
, &opt
))
1804 set_connectivity_errors(commands
, si
);
1807 finish_async(&muxer
);
1809 reject_updates_to_hidden(commands
);
1812 * Try to find commands that have special prefix in their reference names,
1813 * and mark them to run an external "proc-receive" hook later.
1815 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1816 if (!should_process_cmd(cmd
))
1819 /* TODO: replace the fixed prefix by looking up git config variables. */
1820 if (!strncmp(cmd
->ref_name
, "refs/for/", 9)) {
1821 cmd
->run_proc_receive
= RUN_PROC_RECEIVE_SCHEDULED
;
1822 run_proc_receive
= 1;
1826 if (run_receive_hook(commands
, "pre-receive", 0, push_options
)) {
1827 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1828 if (!cmd
->error_string
)
1829 cmd
->error_string
= "pre-receive hook declined";
1835 * Now we'll start writing out refs, which means the objects need
1836 * to be in their final positions so that other processes can see them.
1838 if (tmp_objdir_migrate(tmp_objdir
) < 0) {
1839 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
1840 if (!cmd
->error_string
)
1841 cmd
->error_string
= "unable to migrate objects to permanent storage";
1847 check_aliased_updates(commands
);
1849 free(head_name_to_free
);
1850 head_name
= head_name_to_free
= resolve_refdup("HEAD", 0, NULL
, NULL
);
1852 if (run_proc_receive
&&
1853 run_proc_receive_hook(commands
, push_options
))
1854 for (cmd
= commands
; cmd
; cmd
= cmd
->next
)
1855 if (!cmd
->error_string
&&
1856 !(cmd
->run_proc_receive
& RUN_PROC_RECEIVE_RETURNED
) &&
1857 (cmd
->run_proc_receive
|| use_atomic
))
1858 cmd
->error_string
= "fail to run proc-receive hook";
1861 execute_commands_atomic(commands
, si
);
1863 execute_commands_non_atomic(commands
, si
);
1866 warn_if_skipped_connectivity_check(commands
, si
);
1869 static struct command
**queue_command(struct command
**tail
,
1873 struct object_id old_oid
, new_oid
;
1874 struct command
*cmd
;
1875 const char *refname
;
1879 if (parse_oid_hex(line
, &old_oid
, &p
) ||
1881 parse_oid_hex(p
, &new_oid
, &p
) ||
1883 die("protocol error: expected old/new/ref, got '%s'", line
);
1886 reflen
= linelen
- (p
- line
);
1887 FLEX_ALLOC_MEM(cmd
, ref_name
, refname
, reflen
);
1888 oidcpy(&cmd
->old_oid
, &old_oid
);
1889 oidcpy(&cmd
->new_oid
, &new_oid
);
1894 static void queue_commands_from_cert(struct command
**tail
,
1895 struct strbuf
*push_cert
)
1897 const char *boc
, *eoc
;
1900 die("protocol error: got both push certificate and unsigned commands");
1902 boc
= strstr(push_cert
->buf
, "\n\n");
1904 die("malformed push certificate %.*s", 100, push_cert
->buf
);
1907 eoc
= push_cert
->buf
+ parse_signature(push_cert
->buf
, push_cert
->len
);
1910 const char *eol
= memchr(boc
, '\n', eoc
- boc
);
1911 tail
= queue_command(tail
, boc
, eol
? eol
- boc
: eoc
- boc
);
1912 boc
= eol
? eol
+ 1 : eoc
;
1916 static struct command
*read_head_info(struct packet_reader
*reader
,
1917 struct oid_array
*shallow
)
1919 struct command
*commands
= NULL
;
1920 struct command
**p
= &commands
;
1924 if (packet_reader_read(reader
) != PACKET_READ_NORMAL
)
1927 if (reader
->pktlen
> 8 && starts_with(reader
->line
, "shallow ")) {
1928 struct object_id oid
;
1929 if (get_oid_hex(reader
->line
+ 8, &oid
))
1930 die("protocol error: expected shallow sha, got '%s'",
1932 oid_array_append(shallow
, &oid
);
1936 linelen
= strlen(reader
->line
);
1937 if (linelen
< reader
->pktlen
) {
1938 const char *feature_list
= reader
->line
+ linelen
+ 1;
1939 if (parse_feature_request(feature_list
, "report-status"))
1941 if (parse_feature_request(feature_list
, "report-status-v2"))
1942 report_status_v2
= 1;
1943 if (parse_feature_request(feature_list
, "side-band-64k"))
1944 use_sideband
= LARGE_PACKET_MAX
;
1945 if (parse_feature_request(feature_list
, "quiet"))
1947 if (advertise_atomic_push
1948 && parse_feature_request(feature_list
, "atomic"))
1950 if (advertise_push_options
1951 && parse_feature_request(feature_list
, "push-options"))
1952 use_push_options
= 1;
1955 if (!strcmp(reader
->line
, "push-cert")) {
1957 int saved_options
= reader
->options
;
1958 reader
->options
&= ~PACKET_READ_CHOMP_NEWLINE
;
1961 packet_reader_read(reader
);
1962 if (reader
->status
== PACKET_READ_FLUSH
) {
1966 if (reader
->status
!= PACKET_READ_NORMAL
) {
1967 die("protocol error: got an unexpected packet");
1969 if (!strcmp(reader
->line
, "push-cert-end\n"))
1970 break; /* end of cert */
1971 strbuf_addstr(&push_cert
, reader
->line
);
1973 reader
->options
= saved_options
;
1980 p
= queue_command(p
, reader
->line
, linelen
);
1984 queue_commands_from_cert(p
, &push_cert
);
1989 static void read_push_options(struct packet_reader
*reader
,
1990 struct string_list
*options
)
1993 if (packet_reader_read(reader
) != PACKET_READ_NORMAL
)
1996 string_list_append(options
, reader
->line
);
2000 static const char *parse_pack_header(struct pack_header
*hdr
)
2002 switch (read_pack_header(0, hdr
)) {
2004 return "eof before pack header was fully read";
2006 case PH_ERROR_PACK_SIGNATURE
:
2007 return "protocol error (pack signature mismatch detected)";
2009 case PH_ERROR_PROTOCOL
:
2010 return "protocol error (pack version unsupported)";
2013 return "unknown error in parse_pack_header";
2020 static const char *pack_lockfile
;
2022 static void push_header_arg(struct argv_array
*args
, struct pack_header
*hdr
)
2024 argv_array_pushf(args
, "--pack_header=%"PRIu32
",%"PRIu32
,
2025 ntohl(hdr
->hdr_version
), ntohl(hdr
->hdr_entries
));
2028 static const char *unpack(int err_fd
, struct shallow_info
*si
)
2030 struct pack_header hdr
;
2031 const char *hdr_err
;
2033 struct child_process child
= CHILD_PROCESS_INIT
;
2034 int fsck_objects
= (receive_fsck_objects
>= 0
2035 ? receive_fsck_objects
2036 : transfer_fsck_objects
>= 0
2037 ? transfer_fsck_objects
2040 hdr_err
= parse_pack_header(&hdr
);
2047 if (si
->nr_ours
|| si
->nr_theirs
) {
2048 alt_shallow_file
= setup_temporary_shallow(si
->shallow
);
2049 argv_array_push(&child
.args
, "--shallow-file");
2050 argv_array_push(&child
.args
, alt_shallow_file
);
2053 tmp_objdir
= tmp_objdir_create();
2057 return "unable to create temporary object directory";
2059 child
.env
= tmp_objdir_env(tmp_objdir
);
2062 * Normally we just pass the tmp_objdir environment to the child
2063 * processes that do the heavy lifting, but we may need to see these
2064 * objects ourselves to set up shallow information.
2066 tmp_objdir_add_as_alternate(tmp_objdir
);
2068 if (ntohl(hdr
.hdr_entries
) < unpack_limit
) {
2069 argv_array_push(&child
.args
, "unpack-objects");
2070 push_header_arg(&child
.args
, &hdr
);
2072 argv_array_push(&child
.args
, "-q");
2074 argv_array_pushf(&child
.args
, "--strict%s",
2075 fsck_msg_types
.buf
);
2077 argv_array_pushf(&child
.args
, "--max-input-size=%"PRIuMAX
,
2078 (uintmax_t)max_input_size
);
2079 child
.no_stdout
= 1;
2082 status
= run_command(&child
);
2084 return "unpack-objects abnormal exit";
2086 char hostname
[HOST_NAME_MAX
+ 1];
2088 argv_array_pushl(&child
.args
, "index-pack", "--stdin", NULL
);
2089 push_header_arg(&child
.args
, &hdr
);
2091 if (xgethostname(hostname
, sizeof(hostname
)))
2092 xsnprintf(hostname
, sizeof(hostname
), "localhost");
2093 argv_array_pushf(&child
.args
,
2094 "--keep=receive-pack %"PRIuMAX
" on %s",
2095 (uintmax_t)getpid(),
2098 if (!quiet
&& err_fd
)
2099 argv_array_push(&child
.args
, "--show-resolving-progress");
2101 argv_array_push(&child
.args
, "--report-end-of-input");
2103 argv_array_pushf(&child
.args
, "--strict%s",
2104 fsck_msg_types
.buf
);
2106 argv_array_push(&child
.args
, "--fix-thin");
2108 argv_array_pushf(&child
.args
, "--max-input-size=%"PRIuMAX
,
2109 (uintmax_t)max_input_size
);
2113 status
= start_command(&child
);
2115 return "index-pack fork failed";
2116 pack_lockfile
= index_pack_lockfile(child
.out
);
2118 status
= finish_command(&child
);
2120 return "index-pack abnormal exit";
2121 reprepare_packed_git(the_repository
);
2126 static const char *unpack_with_sideband(struct shallow_info
*si
)
2132 return unpack(0, si
);
2134 use_keepalive
= KEEPALIVE_AFTER_NUL
;
2135 memset(&muxer
, 0, sizeof(muxer
));
2136 muxer
.proc
= copy_to_sideband
;
2138 if (start_async(&muxer
))
2141 ret
= unpack(muxer
.in
, si
);
2143 finish_async(&muxer
);
2147 static void prepare_shallow_update(struct shallow_info
*si
)
2149 int i
, j
, k
, bitmap_size
= DIV_ROUND_UP(si
->ref
->nr
, 32);
2151 ALLOC_ARRAY(si
->used_shallow
, si
->shallow
->nr
);
2152 assign_shallow_commits_to_refs(si
, si
->used_shallow
, NULL
);
2154 si
->need_reachability_test
=
2155 xcalloc(si
->shallow
->nr
, sizeof(*si
->need_reachability_test
));
2157 xcalloc(si
->shallow
->nr
, sizeof(*si
->reachable
));
2158 si
->shallow_ref
= xcalloc(si
->ref
->nr
, sizeof(*si
->shallow_ref
));
2160 for (i
= 0; i
< si
->nr_ours
; i
++)
2161 si
->need_reachability_test
[si
->ours
[i
]] = 1;
2163 for (i
= 0; i
< si
->shallow
->nr
; i
++) {
2164 if (!si
->used_shallow
[i
])
2166 for (j
= 0; j
< bitmap_size
; j
++) {
2167 if (!si
->used_shallow
[i
][j
])
2169 si
->need_reachability_test
[i
]++;
2170 for (k
= 0; k
< 32; k
++)
2171 if (si
->used_shallow
[i
][j
] & (1U << k
))
2172 si
->shallow_ref
[j
* 32 + k
]++;
2176 * true for those associated with some refs and belong
2177 * in "ours" list aka "step 7 not done yet"
2179 si
->need_reachability_test
[i
] =
2180 si
->need_reachability_test
[i
] > 1;
2184 * keep hooks happy by forcing a temporary shallow file via
2185 * env variable because we can't add --shallow-file to every
2186 * command. check_connected() will be done with
2187 * true .git/shallow though.
2189 setenv(GIT_SHALLOW_FILE_ENVIRONMENT
, alt_shallow_file
, 1);
2192 static void update_shallow_info(struct command
*commands
,
2193 struct shallow_info
*si
,
2194 struct oid_array
*ref
)
2196 struct command
*cmd
;
2198 remove_nonexistent_theirs_shallow(si
);
2199 if (!si
->nr_ours
&& !si
->nr_theirs
) {
2204 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
2205 if (is_null_oid(&cmd
->new_oid
))
2207 oid_array_append(ref
, &cmd
->new_oid
);
2208 cmd
->index
= ref
->nr
- 1;
2212 if (shallow_update
) {
2213 prepare_shallow_update(si
);
2217 ALLOC_ARRAY(ref_status
, ref
->nr
);
2218 assign_shallow_commits_to_refs(si
, NULL
, ref_status
);
2219 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
2220 if (is_null_oid(&cmd
->new_oid
))
2222 if (ref_status
[cmd
->index
]) {
2223 cmd
->error_string
= "shallow update not allowed";
2224 cmd
->skip_update
= 1;
2230 static void report(struct command
*commands
, const char *unpack_status
)
2232 struct command
*cmd
;
2233 struct strbuf buf
= STRBUF_INIT
;
2235 packet_buf_write(&buf
, "unpack %s\n",
2236 unpack_status
? unpack_status
: "ok");
2237 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
2238 if (!cmd
->error_string
)
2239 packet_buf_write(&buf
, "ok %s\n",
2242 packet_buf_write(&buf
, "ng %s %s\n",
2243 cmd
->ref_name
, cmd
->error_string
);
2245 packet_buf_flush(&buf
);
2248 send_sideband(1, 1, buf
.buf
, buf
.len
, use_sideband
);
2250 write_or_die(1, buf
.buf
, buf
.len
);
2251 strbuf_release(&buf
);
2254 static void report_v2(struct command
*commands
, const char *unpack_status
)
2256 struct command
*cmd
;
2257 struct strbuf buf
= STRBUF_INIT
;
2258 struct ref_push_report
*report
;
2260 packet_buf_write(&buf
, "unpack %s\n",
2261 unpack_status
? unpack_status
: "ok");
2262 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
2265 if (cmd
->error_string
) {
2266 packet_buf_write(&buf
, "ng %s %s\n",
2271 packet_buf_write(&buf
, "ok %s\n",
2273 for (report
= cmd
->report
; report
; report
= report
->next
) {
2275 packet_buf_write(&buf
, "ok %s\n",
2277 if (report
->ref_name
)
2278 packet_buf_write(&buf
, "option refname %s\n",
2280 if (report
->old_oid
)
2281 packet_buf_write(&buf
, "option old-oid %s\n",
2282 oid_to_hex(report
->old_oid
));
2283 if (report
->new_oid
)
2284 packet_buf_write(&buf
, "option new-oid %s\n",
2285 oid_to_hex(report
->new_oid
));
2286 if (report
->forced_update
)
2287 packet_buf_write(&buf
, "option forced-update\n");
2290 packet_buf_flush(&buf
);
2293 send_sideband(1, 1, buf
.buf
, buf
.len
, use_sideband
);
2295 write_or_die(1, buf
.buf
, buf
.len
);
2296 strbuf_release(&buf
);
2299 static int delete_only(struct command
*commands
)
2301 struct command
*cmd
;
2302 for (cmd
= commands
; cmd
; cmd
= cmd
->next
) {
2303 if (!is_null_oid(&cmd
->new_oid
))
2309 int cmd_receive_pack(int argc
, const char **argv
, const char *prefix
)
2311 int advertise_refs
= 0;
2312 struct command
*commands
;
2313 struct oid_array shallow
= OID_ARRAY_INIT
;
2314 struct oid_array ref
= OID_ARRAY_INIT
;
2315 struct shallow_info si
;
2316 struct packet_reader reader
;
2318 struct option options
[] = {
2319 OPT__QUIET(&quiet
, N_("quiet")),
2320 OPT_HIDDEN_BOOL(0, "stateless-rpc", &stateless_rpc
, NULL
),
2321 OPT_HIDDEN_BOOL(0, "advertise-refs", &advertise_refs
, NULL
),
2322 OPT_HIDDEN_BOOL(0, "reject-thin-pack-for-testing", &reject_thin
, NULL
),
2326 packet_trace_identity("receive-pack");
2328 argc
= parse_options(argc
, argv
, prefix
, options
, receive_pack_usage
, 0);
2331 usage_msg_opt(_("Too many arguments."), receive_pack_usage
, options
);
2333 usage_msg_opt(_("You must specify a directory."), receive_pack_usage
, options
);
2335 service_dir
= argv
[0];
2339 if (!enter_repo(service_dir
, 0))
2340 die("'%s' does not appear to be a git repository", service_dir
);
2342 git_config(receive_pack_config
, NULL
);
2343 if (cert_nonce_seed
)
2344 push_cert_nonce
= prepare_push_cert_nonce(service_dir
, time(NULL
));
2346 if (0 <= transfer_unpack_limit
)
2347 unpack_limit
= transfer_unpack_limit
;
2348 else if (0 <= receive_unpack_limit
)
2349 unpack_limit
= receive_unpack_limit
;
2351 switch (determine_protocol_version_server()) {
2354 * push support for protocol v2 has not been implemented yet,
2355 * so ignore the request to use v2 and fallback to using v0.
2360 * v1 is just the original protocol with a version string,
2361 * so just fall through after writing the version string.
2363 if (advertise_refs
|| !stateless_rpc
)
2364 packet_write_fmt(1, "version 1\n");
2369 case protocol_unknown_version
:
2370 BUG("unknown protocol version");
2373 if (advertise_refs
|| !stateless_rpc
) {
2379 packet_reader_init(&reader
, 0, NULL
, 0,
2380 PACKET_READ_CHOMP_NEWLINE
|
2381 PACKET_READ_DIE_ON_ERR_PACKET
);
2383 if ((commands
= read_head_info(&reader
, &shallow
)) != NULL
) {
2384 const char *unpack_status
= NULL
;
2385 struct string_list push_options
= STRING_LIST_INIT_DUP
;
2387 if (use_push_options
)
2388 read_push_options(&reader
, &push_options
);
2389 if (!check_cert_push_options(&push_options
)) {
2390 struct command
*cmd
;
2391 for (cmd
= commands
; cmd
; cmd
= cmd
->next
)
2392 cmd
->error_string
= "inconsistent push options";
2395 prepare_shallow_info(&si
, &shallow
);
2396 if (!si
.nr_ours
&& !si
.nr_theirs
)
2398 if (!delete_only(commands
)) {
2399 unpack_status
= unpack_with_sideband(&si
);
2400 update_shallow_info(commands
, &si
, &ref
);
2402 use_keepalive
= KEEPALIVE_ALWAYS
;
2403 execute_commands(commands
, unpack_status
, &si
,
2406 unlink_or_warn(pack_lockfile
);
2407 if (report_status_v2
)
2408 report_v2(commands
, unpack_status
);
2409 else if (report_status
)
2410 report(commands
, unpack_status
);
2411 run_receive_hook(commands
, "post-receive", 1,
2413 run_update_post_hook(commands
);
2414 string_list_clear(&push_options
, 0);
2416 const char *argv_gc_auto
[] = {
2417 "gc", "--auto", "--quiet", NULL
,
2419 struct child_process proc
= CHILD_PROCESS_INIT
;
2422 proc
.stdout_to_stderr
= 1;
2423 proc
.err
= use_sideband
? -1 : 0;
2425 proc
.argv
= argv_gc_auto
;
2427 close_object_store(the_repository
->objects
);
2428 if (!start_command(&proc
)) {
2430 copy_to_sideband(proc
.err
, -1, NULL
);
2431 finish_command(&proc
);
2434 if (auto_update_server_info
)
2435 update_server_info(0);
2436 clear_shallow_info(&si
);
2440 oid_array_clear(&shallow
);
2441 oid_array_clear(&ref
);
2442 free((void *)push_cert_nonce
);