Stephen Boyd | 1e4cd68 | 2011-04-03 00:06:54 -0700 | [diff] [blame] | 1 | #include "builtin.h" |
Stefan Beller | a49d283 | 2018-03-23 18:45:21 +0100 | [diff] [blame] | 2 | #include "repository.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 3 | #include "config.h" |
Michael Haggerty | 697cc8e | 2014-10-01 12:28:42 +0200 | [diff] [blame] | 4 | #include "lockfile.h" |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 5 | #include "pack.h" |
Linus Torvalds | 8a65ff7 | 2005-07-02 20:23:36 -0700 | [diff] [blame] | 6 | #include "refs.h" |
Linus Torvalds | f3a3214 | 2005-06-29 20:50:15 -0700 | [diff] [blame] | 7 | #include "pkt-line.h" |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 8 | #include "sideband.h" |
Josef Weidendorfer | b1bf95b | 2005-07-31 21:17:43 +0200 | [diff] [blame] | 9 | #include "run-command.h" |
Stefan Beller | d807c4a | 2018-04-10 14:26:18 -0700 | [diff] [blame] | 10 | #include "exec-cmd.h" |
Johannes Schindelin | 11031d7 | 2006-09-21 01:07:54 +0200 | [diff] [blame] | 11 | #include "commit.h" |
| 12 | #include "object.h" |
Junio C Hamano | d79796b | 2008-09-09 01:27:10 -0700 | [diff] [blame] | 13 | #include "remote.h" |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 14 | #include "connect.h" |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 15 | #include "string-list.h" |
Jeff King | fe299ec | 2020-03-30 10:03:46 -0400 | [diff] [blame] | 16 | #include "oid-array.h" |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 17 | #include "connected.h" |
Jeff King | dbbcd44 | 2020-07-28 16:23:39 -0400 | [diff] [blame] | 18 | #include "strvec.h" |
Jeff King | ff5effd | 2012-08-03 12:19:16 -0400 | [diff] [blame] | 19 | #include "version.h" |
Junio C Hamano | d05b961 | 2014-08-14 15:59:21 -0700 | [diff] [blame] | 20 | #include "tag.h" |
| 21 | #include "gpg-interface.h" |
Junio C Hamano | ec7dbd1 | 2014-09-12 15:48:07 -0700 | [diff] [blame] | 22 | #include "sigchain.h" |
Johannes Schindelin | 5d477a3 | 2015-06-22 17:25:31 +0200 | [diff] [blame] | 23 | #include "fsck.h" |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 24 | #include "tmp-objdir.h" |
Jeff King | ab6eea6 | 2017-02-08 15:53:10 -0500 | [diff] [blame] | 25 | #include "oidset.h" |
Jonathan Tan | 3836d88 | 2017-08-18 15:20:21 -0700 | [diff] [blame] | 26 | #include "packfile.h" |
Stefan Beller | cbd53a2 | 2018-05-15 16:42:15 -0700 | [diff] [blame] | 27 | #include "object-store.h" |
Brandon Williams | aa9bab2 | 2017-10-16 10:55:26 -0700 | [diff] [blame] | 28 | #include "protocol.h" |
Derrick Stolee | 6404355 | 2018-07-20 16:33:04 +0000 | [diff] [blame] | 29 | #include "commit-reach.h" |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 30 | #include "worktree.h" |
Taylor Blau | 120ad2b | 2020-04-30 13:48:50 -0600 | [diff] [blame] | 31 | #include "shallow.h" |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 32 | |
Sidhant Sharma [:tk] | 1b68387 | 2016-03-02 01:51:01 +0530 | [diff] [blame] | 33 | static const char * const receive_pack_usage[] = { |
| 34 | N_("git receive-pack <git-dir>"), |
| 35 | NULL |
| 36 | }; |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 37 | |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 38 | enum deny_action { |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 39 | DENY_UNCONFIGURED, |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 40 | DENY_IGNORE, |
| 41 | DENY_WARN, |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 42 | DENY_REFUSE, |
| 43 | DENY_UPDATE_INSTEAD |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 44 | }; |
| 45 | |
Junio C Hamano | 1b53a07 | 2009-02-08 22:19:43 -0800 | [diff] [blame] | 46 | static int deny_deletes; |
| 47 | static int deny_non_fast_forwards; |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 48 | static enum deny_action deny_current_branch = DENY_UNCONFIGURED; |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 49 | static enum deny_action deny_delete_current = DENY_UNCONFIGURED; |
Junio C Hamano | dab76d3 | 2011-09-04 12:37:45 -0700 | [diff] [blame] | 50 | static int receive_fsck_objects = -1; |
| 51 | static int transfer_fsck_objects = -1; |
Johannes Schindelin | 5d477a3 | 2015-06-22 17:25:31 +0200 | [diff] [blame] | 52 | static struct strbuf fsck_msg_types = STRBUF_INIT; |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 53 | static int receive_unpack_limit = -1; |
| 54 | static int transfer_unpack_limit = -1; |
Ronnie Sahlberg | 1b70fe5 | 2015-01-07 19:23:20 -0800 | [diff] [blame] | 55 | static int advertise_atomic_push = 1; |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 56 | static int advertise_push_options; |
Nicolas Pitre | 46732fa | 2006-12-06 23:01:00 -0500 | [diff] [blame] | 57 | static int unpack_limit = 100; |
Jeff King | c08db5a | 2016-08-24 20:41:57 +0200 | [diff] [blame] | 58 | static off_t max_input_size; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 59 | static int report_status; |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 60 | static int use_sideband; |
Stefan Beller | 68deed2 | 2015-01-07 19:23:19 -0800 | [diff] [blame] | 61 | static int use_atomic; |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 62 | static int use_push_options; |
Clemens Buchacher | c207e34 | 2012-01-08 22:06:20 +0100 | [diff] [blame] | 63 | static int quiet; |
Nicolas Pitre | b74fce1 | 2009-05-01 16:56:47 -0400 | [diff] [blame] | 64 | static int prefer_ofs_delta = 1; |
Junio C Hamano | 77e3efb | 2009-10-20 14:56:40 -0700 | [diff] [blame] | 65 | static int auto_update_server_info; |
| 66 | static int auto_gc = 1; |
Sidhant Sharma [:tk] | 1b68387 | 2016-03-02 01:51:01 +0530 | [diff] [blame] | 67 | static int reject_thin; |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 68 | static int stateless_rpc; |
| 69 | static const char *service_dir; |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 70 | static const char *head_name; |
Nguyễn Thái Ngọc Duy | 96ec7b1 | 2011-12-13 21:17:48 +0700 | [diff] [blame] | 71 | static void *head_name_to_free; |
Shawn O. Pearce | 185c04e | 2010-02-05 12:57:40 -0800 | [diff] [blame] | 72 | static int sent_capabilities; |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 73 | static int shallow_update; |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 74 | static const char *alt_shallow_file; |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 75 | static struct strbuf push_cert = STRBUF_INIT; |
Patryk Obara | a09c985 | 2018-01-28 01:13:19 +0100 | [diff] [blame] | 76 | static struct object_id push_cert_oid; |
Junio C Hamano | d05b961 | 2014-08-14 15:59:21 -0700 | [diff] [blame] | 77 | static struct signature_check sigcheck; |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 78 | static const char *push_cert_nonce; |
| 79 | static const char *cert_nonce_seed; |
| 80 | |
| 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"; |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 85 | static const char *NONCE_SLOP = "SLOP"; |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 86 | static const char *nonce_status; |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 87 | static long nonce_stamp_slop; |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 88 | static timestamp_t nonce_stamp_slop_limit; |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 89 | static struct ref_transaction *transaction; |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 90 | |
Jeff King | 8355868 | 2016-07-15 06:43:47 -0400 | [diff] [blame] | 91 | static enum { |
| 92 | KEEPALIVE_NEVER = 0, |
| 93 | KEEPALIVE_AFTER_NUL, |
| 94 | KEEPALIVE_ALWAYS |
| 95 | } use_keepalive; |
| 96 | static int keepalive_in_sec = 5; |
| 97 | |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 98 | static struct tmp_objdir *tmp_objdir; |
| 99 | |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 100 | static enum deny_action parse_deny_action(const char *var, const char *value) |
| 101 | { |
| 102 | if (value) { |
| 103 | if (!strcasecmp(value, "ignore")) |
| 104 | return DENY_IGNORE; |
| 105 | if (!strcasecmp(value, "warn")) |
| 106 | return DENY_WARN; |
| 107 | if (!strcasecmp(value, "refuse")) |
| 108 | return DENY_REFUSE; |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 109 | if (!strcasecmp(value, "updateinstead")) |
| 110 | return DENY_UPDATE_INSTEAD; |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 111 | } |
| 112 | if (git_config_bool(var, value)) |
| 113 | return DENY_REFUSE; |
| 114 | return DENY_IGNORE; |
| 115 | } |
| 116 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 117 | static int receive_pack_config(const char *var, const char *value, void *cb) |
Shawn Pearce | 6fb75be | 2006-10-30 17:35:18 -0500 | [diff] [blame] | 118 | { |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 119 | int status = parse_hide_refs_config(var, value, "receive"); |
| 120 | |
| 121 | if (status) |
| 122 | return status; |
| 123 | |
Jan Krüger | a240de1 | 2008-11-01 15:42:16 +0100 | [diff] [blame] | 124 | if (strcmp(var, "receive.denydeletes") == 0) { |
| 125 | deny_deletes = git_config_bool(var, value); |
| 126 | return 0; |
| 127 | } |
| 128 | |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 129 | if (strcmp(var, "receive.denynonfastforwards") == 0) { |
Shawn Pearce | 6fb75be | 2006-10-30 17:35:18 -0500 | [diff] [blame] | 130 | deny_non_fast_forwards = git_config_bool(var, value); |
| 131 | return 0; |
| 132 | } |
| 133 | |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 134 | if (strcmp(var, "receive.unpacklimit") == 0) { |
| 135 | receive_unpack_limit = git_config_int(var, value); |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 136 | return 0; |
| 137 | } |
| 138 | |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 139 | if (strcmp(var, "transfer.unpacklimit") == 0) { |
| 140 | transfer_unpack_limit = git_config_int(var, value); |
| 141 | return 0; |
| 142 | } |
| 143 | |
Johannes Schindelin | cd94c6f | 2015-06-22 17:27:18 +0200 | [diff] [blame] | 144 | if (strcmp(var, "receive.fsck.skiplist") == 0) { |
| 145 | const char *path; |
| 146 | |
| 147 | if (git_config_pathname(&path, var, value)) |
| 148 | return 1; |
| 149 | strbuf_addf(&fsck_msg_types, "%cskiplist=%s", |
| 150 | fsck_msg_types.len ? ',' : '=', path); |
| 151 | free((char *)path); |
| 152 | return 0; |
| 153 | } |
| 154 | |
Johannes Schindelin | 5d477a3 | 2015-06-22 17:25:31 +0200 | [diff] [blame] | 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); |
| 159 | else |
| 160 | warning("Skipping unknown msg id '%s'", var); |
| 161 | return 0; |
| 162 | } |
| 163 | |
Martin Koegler | 20dc001 | 2008-02-25 22:46:13 +0100 | [diff] [blame] | 164 | if (strcmp(var, "receive.fsckobjects") == 0) { |
| 165 | receive_fsck_objects = git_config_bool(var, value); |
| 166 | return 0; |
| 167 | } |
| 168 | |
Junio C Hamano | dab76d3 | 2011-09-04 12:37:45 -0700 | [diff] [blame] | 169 | if (strcmp(var, "transfer.fsckobjects") == 0) { |
| 170 | transfer_fsck_objects = git_config_bool(var, value); |
| 171 | return 0; |
| 172 | } |
| 173 | |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 174 | if (!strcmp(var, "receive.denycurrentbranch")) { |
| 175 | deny_current_branch = parse_deny_action(var, value); |
| 176 | return 0; |
| 177 | } |
| 178 | |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 179 | if (strcmp(var, "receive.denydeletecurrent") == 0) { |
| 180 | deny_delete_current = parse_deny_action(var, value); |
| 181 | return 0; |
| 182 | } |
| 183 | |
Nicolas Pitre | b74fce1 | 2009-05-01 16:56:47 -0400 | [diff] [blame] | 184 | if (strcmp(var, "repack.usedeltabaseoffset") == 0) { |
| 185 | prefer_ofs_delta = git_config_bool(var, value); |
| 186 | return 0; |
| 187 | } |
| 188 | |
Junio C Hamano | 77e3efb | 2009-10-20 14:56:40 -0700 | [diff] [blame] | 189 | if (strcmp(var, "receive.updateserverinfo") == 0) { |
| 190 | auto_update_server_info = git_config_bool(var, value); |
| 191 | return 0; |
| 192 | } |
| 193 | |
| 194 | if (strcmp(var, "receive.autogc") == 0) { |
| 195 | auto_gc = git_config_bool(var, value); |
| 196 | return 0; |
| 197 | } |
| 198 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 199 | if (strcmp(var, "receive.shallowupdate") == 0) { |
| 200 | shallow_update = git_config_bool(var, value); |
| 201 | return 0; |
| 202 | } |
| 203 | |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 204 | if (strcmp(var, "receive.certnonceseed") == 0) |
| 205 | return git_config_string(&cert_nonce_seed, var, value); |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 206 | |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 207 | if (strcmp(var, "receive.certnonceslop") == 0) { |
| 208 | nonce_stamp_slop_limit = git_config_ulong(var, value); |
| 209 | return 0; |
| 210 | } |
| 211 | |
Ronnie Sahlberg | 1b70fe5 | 2015-01-07 19:23:20 -0800 | [diff] [blame] | 212 | if (strcmp(var, "receive.advertiseatomic") == 0) { |
| 213 | advertise_atomic_push = git_config_bool(var, value); |
| 214 | return 0; |
| 215 | } |
| 216 | |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 217 | if (strcmp(var, "receive.advertisepushoptions") == 0) { |
| 218 | advertise_push_options = git_config_bool(var, value); |
| 219 | return 0; |
| 220 | } |
| 221 | |
Jeff King | 8355868 | 2016-07-15 06:43:47 -0400 | [diff] [blame] | 222 | if (strcmp(var, "receive.keepalive") == 0) { |
| 223 | keepalive_in_sec = git_config_int(var, value); |
| 224 | return 0; |
| 225 | } |
| 226 | |
Jeff King | c08db5a | 2016-08-24 20:41:57 +0200 | [diff] [blame] | 227 | if (strcmp(var, "receive.maxinputsize") == 0) { |
| 228 | max_input_size = git_config_int64(var, value); |
| 229 | return 0; |
| 230 | } |
| 231 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 232 | return git_default_config(var, value, cb); |
Shawn Pearce | 6fb75be | 2006-10-30 17:35:18 -0500 | [diff] [blame] | 233 | } |
| 234 | |
brian m. carlson | 1b7ba79 | 2017-03-31 01:39:59 +0000 | [diff] [blame] | 235 | static void show_ref(const char *path, const struct object_id *oid) |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 236 | { |
Junio C Hamano | 52d2ae5 | 2014-09-04 12:13:32 -0700 | [diff] [blame] | 237 | if (sent_capabilities) { |
brian m. carlson | 1b7ba79 | 2017-03-31 01:39:59 +0000 | [diff] [blame] | 238 | packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), path); |
Junio C Hamano | 52d2ae5 | 2014-09-04 12:13:32 -0700 | [diff] [blame] | 239 | } else { |
| 240 | struct strbuf cap = STRBUF_INIT; |
| 241 | |
| 242 | strbuf_addstr(&cap, |
| 243 | "report-status delete-refs side-band-64k quiet"); |
Ronnie Sahlberg | 1b70fe5 | 2015-01-07 19:23:20 -0800 | [diff] [blame] | 244 | if (advertise_atomic_push) |
| 245 | strbuf_addstr(&cap, " atomic"); |
Junio C Hamano | 52d2ae5 | 2014-09-04 12:13:32 -0700 | [diff] [blame] | 246 | if (prefer_ofs_delta) |
| 247 | strbuf_addstr(&cap, " ofs-delta"); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 248 | if (push_cert_nonce) |
| 249 | strbuf_addf(&cap, " push-cert=%s", push_cert_nonce); |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 250 | if (advertise_push_options) |
| 251 | strbuf_addstr(&cap, " push-options"); |
brian m. carlson | bf30dbf | 2020-05-25 19:58:51 +0000 | [diff] [blame] | 252 | strbuf_addf(&cap, " object-format=%s", the_hash_algo->name); |
Junio C Hamano | 52d2ae5 | 2014-09-04 12:13:32 -0700 | [diff] [blame] | 253 | strbuf_addf(&cap, " agent=%s", git_user_agent_sanitized()); |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 254 | packet_write_fmt(1, "%s %s%c%s\n", |
brian m. carlson | 1b7ba79 | 2017-03-31 01:39:59 +0000 | [diff] [blame] | 255 | oid_to_hex(oid), path, 0, cap.buf); |
Junio C Hamano | 52d2ae5 | 2014-09-04 12:13:32 -0700 | [diff] [blame] | 256 | strbuf_release(&cap); |
| 257 | sent_capabilities = 1; |
| 258 | } |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 259 | } |
| 260 | |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 261 | static int show_ref_cb(const char *path_full, const struct object_id *oid, |
Jeff King | 8b24b9e | 2017-02-08 15:53:16 -0500 | [diff] [blame] | 262 | int flag, void *data) |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 263 | { |
Jeff King | 8b24b9e | 2017-02-08 15:53:16 -0500 | [diff] [blame] | 264 | struct oidset *seen = data; |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 265 | const char *path = strip_namespace(path_full); |
| 266 | |
| 267 | if (ref_is_hidden(path, path_full)) |
| 268 | return 0; |
| 269 | |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 270 | /* |
| 271 | * Advertise refs outside our current namespace as ".have" |
| 272 | * refs, so that the client can use them to minimize data |
Jeff King | fea6c47 | 2017-02-08 15:53:13 -0500 | [diff] [blame] | 273 | * transfer but will otherwise ignore them. |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 274 | */ |
Jeff King | 8b24b9e | 2017-02-08 15:53:16 -0500 | [diff] [blame] | 275 | if (!path) { |
| 276 | if (oidset_insert(seen, oid)) |
| 277 | return 0; |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 278 | path = ".have"; |
Jeff King | 63d428e | 2017-02-08 15:53:19 -0500 | [diff] [blame] | 279 | } else { |
| 280 | oidset_insert(seen, oid); |
Jeff King | 8b24b9e | 2017-02-08 15:53:16 -0500 | [diff] [blame] | 281 | } |
brian m. carlson | 1b7ba79 | 2017-03-31 01:39:59 +0000 | [diff] [blame] | 282 | show_ref(path, oid); |
Michael Haggerty | bc98201 | 2012-01-06 15:12:32 +0100 | [diff] [blame] | 283 | return 0; |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 284 | } |
| 285 | |
Jeff King | bdf4276 | 2018-10-08 11:09:23 -0700 | [diff] [blame] | 286 | static void show_one_alternate_ref(const struct object_id *oid, |
Jeff King | ab6eea6 | 2017-02-08 15:53:10 -0500 | [diff] [blame] | 287 | void *data) |
Michael Haggerty | b7a025d | 2012-01-06 15:12:31 +0100 | [diff] [blame] | 288 | { |
Jeff King | ab6eea6 | 2017-02-08 15:53:10 -0500 | [diff] [blame] | 289 | struct oidset *seen = data; |
Michael Haggerty | b7a025d | 2012-01-06 15:12:31 +0100 | [diff] [blame] | 290 | |
Jeff King | ab6eea6 | 2017-02-08 15:53:10 -0500 | [diff] [blame] | 291 | if (oidset_insert(seen, oid)) |
| 292 | return; |
| 293 | |
brian m. carlson | 1b7ba79 | 2017-03-31 01:39:59 +0000 | [diff] [blame] | 294 | show_ref(".have", oid); |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 295 | } |
| 296 | |
Linus Torvalds | 8a65ff7 | 2005-07-02 20:23:36 -0700 | [diff] [blame] | 297 | static void write_head_info(void) |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 298 | { |
Jeff King | ab6eea6 | 2017-02-08 15:53:10 -0500 | [diff] [blame] | 299 | static struct oidset seen = OIDSET_INIT; |
Michael Haggerty | 2b2a5be | 2015-05-25 18:38:28 +0000 | [diff] [blame] | 300 | |
Jeff King | 63d428e | 2017-02-08 15:53:19 -0500 | [diff] [blame] | 301 | for_each_ref(show_ref_cb, &seen); |
Jeff King | ab6eea6 | 2017-02-08 15:53:10 -0500 | [diff] [blame] | 302 | for_each_alternate_ref(show_one_alternate_ref, &seen); |
| 303 | oidset_clear(&seen); |
Shawn O. Pearce | 185c04e | 2010-02-05 12:57:40 -0800 | [diff] [blame] | 304 | if (!sent_capabilities) |
brian m. carlson | 1b7ba79 | 2017-03-31 01:39:59 +0000 | [diff] [blame] | 305 | show_ref("capabilities^{}", &null_oid); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 306 | |
Nguyễn Thái Ngọc Duy | ad49136 | 2013-12-05 20:02:32 +0700 | [diff] [blame] | 307 | advertise_shallow_grafts(1); |
| 308 | |
Michael Haggerty | b7a025d | 2012-01-06 15:12:31 +0100 | [diff] [blame] | 309 | /* EOF */ |
| 310 | packet_flush(1); |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 311 | } |
| 312 | |
Linus Torvalds | eb1af2d | 2005-06-29 23:01:14 -0700 | [diff] [blame] | 313 | struct command { |
| 314 | struct command *next; |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 315 | const char *error_string; |
Pang Yan Han | 160b81e | 2011-09-28 23:39:35 +0800 | [diff] [blame] | 316 | unsigned int skip_update:1, |
| 317 | did_not_exist:1; |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 318 | int index; |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 319 | struct object_id old_oid; |
| 320 | struct object_id new_oid; |
Junio C Hamano | 8f1d2e6 | 2006-01-07 01:33:54 -0800 | [diff] [blame] | 321 | char ref_name[FLEX_ARRAY]; /* more */ |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 322 | }; |
| 323 | |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 324 | static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2))); |
| 325 | static void rp_warning(const char *err, ...) __attribute__((format (printf, 1, 2))); |
| 326 | |
| 327 | static void report_message(const char *prefix, const char *err, va_list params) |
| 328 | { |
Jeff King | b7115a3 | 2015-09-24 17:07:00 -0400 | [diff] [blame] | 329 | int sz; |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 330 | char msg[4096]; |
| 331 | |
Jeff King | b7115a3 | 2015-09-24 17:07:00 -0400 | [diff] [blame] | 332 | sz = xsnprintf(msg, sizeof(msg), "%s", prefix); |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 333 | sz += vsnprintf(msg + sz, sizeof(msg) - sz, err, params); |
| 334 | if (sz > (sizeof(msg) - 1)) |
| 335 | sz = sizeof(msg) - 1; |
| 336 | msg[sz++] = '\n'; |
| 337 | |
| 338 | if (use_sideband) |
| 339 | send_sideband(1, 2, msg, sz, use_sideband); |
| 340 | else |
| 341 | xwrite(2, msg, sz); |
| 342 | } |
| 343 | |
| 344 | static void rp_warning(const char *err, ...) |
| 345 | { |
| 346 | va_list params; |
| 347 | va_start(params, err); |
| 348 | report_message("warning: ", err, params); |
| 349 | va_end(params); |
| 350 | } |
| 351 | |
| 352 | static void rp_error(const char *err, ...) |
| 353 | { |
| 354 | va_list params; |
| 355 | va_start(params, err); |
| 356 | report_message("error: ", err, params); |
| 357 | va_end(params); |
| 358 | } |
| 359 | |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 360 | static int copy_to_sideband(int in, int out, void *arg) |
| 361 | { |
| 362 | char data[128]; |
Jeff King | 8355868 | 2016-07-15 06:43:47 -0400 | [diff] [blame] | 363 | int keepalive_active = 0; |
| 364 | |
| 365 | if (keepalive_in_sec <= 0) |
| 366 | use_keepalive = KEEPALIVE_NEVER; |
| 367 | if (use_keepalive == KEEPALIVE_ALWAYS) |
| 368 | keepalive_active = 1; |
| 369 | |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 370 | while (1) { |
Jeff King | 8355868 | 2016-07-15 06:43:47 -0400 | [diff] [blame] | 371 | ssize_t sz; |
| 372 | |
| 373 | if (keepalive_active) { |
| 374 | struct pollfd pfd; |
| 375 | int ret; |
| 376 | |
| 377 | pfd.fd = in; |
| 378 | pfd.events = POLLIN; |
| 379 | ret = poll(&pfd, 1, 1000 * keepalive_in_sec); |
| 380 | |
| 381 | if (ret < 0) { |
| 382 | if (errno == EINTR) |
| 383 | continue; |
| 384 | else |
| 385 | break; |
| 386 | } else if (ret == 0) { |
| 387 | /* no data; send a keepalive packet */ |
| 388 | static const char buf[] = "0005\1"; |
| 389 | write_or_die(1, buf, sizeof(buf) - 1); |
| 390 | continue; |
| 391 | } /* else there is actual data to read */ |
| 392 | } |
| 393 | |
| 394 | sz = xread(in, data, sizeof(data)); |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 395 | if (sz <= 0) |
| 396 | break; |
Jeff King | 8355868 | 2016-07-15 06:43:47 -0400 | [diff] [blame] | 397 | |
| 398 | if (use_keepalive == KEEPALIVE_AFTER_NUL && !keepalive_active) { |
| 399 | const char *p = memchr(data, '\0', sz); |
| 400 | if (p) { |
| 401 | /* |
| 402 | * The NUL tells us to start sending keepalives. Make |
| 403 | * sure we send any other data we read along |
| 404 | * with it. |
| 405 | */ |
| 406 | keepalive_active = 1; |
| 407 | send_sideband(1, 2, data, p - data, use_sideband); |
| 408 | send_sideband(1, 2, p + 1, sz - (p - data + 1), use_sideband); |
| 409 | continue; |
| 410 | } |
| 411 | } |
| 412 | |
| 413 | /* |
| 414 | * Either we're not looking for a NUL signal, or we didn't see |
| 415 | * it yet; just pass along the data. |
| 416 | */ |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 417 | send_sideband(1, 2, data, sz, use_sideband); |
| 418 | } |
| 419 | close(in); |
| 420 | return 0; |
| 421 | } |
| 422 | |
Carlo Marcelo Arenas Belón | 3013118 | 2020-05-05 02:53:26 -0700 | [diff] [blame] | 423 | static void hmac_hash(unsigned char *out, |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 424 | const char *key_in, size_t key_len, |
| 425 | const char *text, size_t text_len) |
| 426 | { |
brian m. carlson | fabec2c | 2019-08-18 20:04:05 +0000 | [diff] [blame] | 427 | unsigned char key[GIT_MAX_BLKSZ]; |
| 428 | unsigned char k_ipad[GIT_MAX_BLKSZ]; |
| 429 | unsigned char k_opad[GIT_MAX_BLKSZ]; |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 430 | int i; |
brian m. carlson | fabec2c | 2019-08-18 20:04:05 +0000 | [diff] [blame] | 431 | git_hash_ctx ctx; |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 432 | |
| 433 | /* RFC 2104 2. (1) */ |
brian m. carlson | fabec2c | 2019-08-18 20:04:05 +0000 | [diff] [blame] | 434 | memset(key, '\0', GIT_MAX_BLKSZ); |
| 435 | if (the_hash_algo->blksz < key_len) { |
| 436 | the_hash_algo->init_fn(&ctx); |
| 437 | the_hash_algo->update_fn(&ctx, key_in, key_len); |
| 438 | the_hash_algo->final_fn(key, &ctx); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 439 | } else { |
| 440 | memcpy(key, key_in, key_len); |
| 441 | } |
| 442 | |
| 443 | /* RFC 2104 2. (2) & (5) */ |
| 444 | for (i = 0; i < sizeof(key); i++) { |
| 445 | k_ipad[i] = key[i] ^ 0x36; |
| 446 | k_opad[i] = key[i] ^ 0x5c; |
| 447 | } |
| 448 | |
| 449 | /* RFC 2104 2. (3) & (4) */ |
brian m. carlson | fabec2c | 2019-08-18 20:04:05 +0000 | [diff] [blame] | 450 | the_hash_algo->init_fn(&ctx); |
| 451 | the_hash_algo->update_fn(&ctx, k_ipad, sizeof(k_ipad)); |
| 452 | the_hash_algo->update_fn(&ctx, text, text_len); |
| 453 | the_hash_algo->final_fn(out, &ctx); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 454 | |
| 455 | /* RFC 2104 2. (6) & (7) */ |
brian m. carlson | fabec2c | 2019-08-18 20:04:05 +0000 | [diff] [blame] | 456 | the_hash_algo->init_fn(&ctx); |
| 457 | the_hash_algo->update_fn(&ctx, k_opad, sizeof(k_opad)); |
| 458 | the_hash_algo->update_fn(&ctx, out, the_hash_algo->rawsz); |
| 459 | the_hash_algo->final_fn(out, &ctx); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 460 | } |
| 461 | |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 462 | static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 463 | { |
| 464 | struct strbuf buf = STRBUF_INIT; |
brian m. carlson | fabec2c | 2019-08-18 20:04:05 +0000 | [diff] [blame] | 465 | unsigned char hash[GIT_MAX_RAWSZ]; |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 466 | |
Johannes Schindelin | cb71f8b | 2017-04-21 12:45:48 +0200 | [diff] [blame] | 467 | strbuf_addf(&buf, "%s:%"PRItime, path, stamp); |
Carlo Marcelo Arenas Belón | 3013118 | 2020-05-05 02:53:26 -0700 | [diff] [blame] | 468 | hmac_hash(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed)); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 469 | strbuf_release(&buf); |
| 470 | |
Carlo Marcelo Arenas Belón | 3013118 | 2020-05-05 02:53:26 -0700 | [diff] [blame] | 471 | /* RFC 2104 5. HMAC-SHA1 or HMAC-SHA256 */ |
brian m. carlson | fc06be3 | 2019-08-18 20:04:24 +0000 | [diff] [blame] | 472 | strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, (int)the_hash_algo->hexsz, hash_to_hex(hash)); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 473 | return strbuf_detach(&buf, NULL); |
| 474 | } |
| 475 | |
| 476 | /* |
| 477 | * NEEDSWORK: reuse find_commit_header() from jk/commit-author-parsing |
| 478 | * after dropping "_commit" from its name and possibly moving it out |
| 479 | * of commit.c |
| 480 | */ |
Jonathan Tan | cbaf82c | 2017-05-09 12:23:53 -0700 | [diff] [blame] | 481 | static char *find_header(const char *msg, size_t len, const char *key, |
| 482 | const char **next_line) |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 483 | { |
| 484 | int key_len = strlen(key); |
| 485 | const char *line = msg; |
| 486 | |
| 487 | while (line && line < msg + len) { |
| 488 | const char *eol = strchrnul(line, '\n'); |
| 489 | |
| 490 | if ((msg + len <= eol) || line == eol) |
| 491 | return NULL; |
| 492 | if (line + key_len < eol && |
| 493 | !memcmp(line, key, key_len) && line[key_len] == ' ') { |
| 494 | int offset = key_len + 1; |
Jonathan Tan | cbaf82c | 2017-05-09 12:23:53 -0700 | [diff] [blame] | 495 | if (next_line) |
| 496 | *next_line = *eol ? eol + 1 : eol; |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 497 | return xmemdupz(line + offset, (eol - line) - offset); |
| 498 | } |
| 499 | line = *eol ? eol + 1 : NULL; |
| 500 | } |
| 501 | return NULL; |
| 502 | } |
| 503 | |
brian m. carlson | edc6dcc | 2020-04-09 23:37:30 +0000 | [diff] [blame] | 504 | /* |
| 505 | * Return zero if a and b are equal up to n bytes and nonzero if they are not. |
| 506 | * This operation is guaranteed to run in constant time to avoid leaking data. |
| 507 | */ |
| 508 | static int constant_memequal(const char *a, const char *b, size_t n) |
| 509 | { |
| 510 | int res = 0; |
Junio C Hamano | 719483e | 2020-04-22 08:55:11 -0700 | [diff] [blame] | 511 | size_t i; |
| 512 | |
| 513 | for (i = 0; i < n; i++) |
brian m. carlson | edc6dcc | 2020-04-09 23:37:30 +0000 | [diff] [blame] | 514 | res |= a[i] ^ b[i]; |
| 515 | return res; |
| 516 | } |
| 517 | |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 518 | static const char *check_nonce(const char *buf, size_t len) |
| 519 | { |
Jonathan Tan | cbaf82c | 2017-05-09 12:23:53 -0700 | [diff] [blame] | 520 | char *nonce = find_header(buf, len, "nonce", NULL); |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 521 | timestamp_t stamp, ostamp; |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 522 | char *bohmac, *expect = NULL; |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 523 | const char *retval = NONCE_BAD; |
brian m. carlson | edc6dcc | 2020-04-09 23:37:30 +0000 | [diff] [blame] | 524 | size_t noncelen; |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 525 | |
| 526 | if (!nonce) { |
| 527 | retval = NONCE_MISSING; |
| 528 | goto leave; |
| 529 | } else if (!push_cert_nonce) { |
| 530 | retval = NONCE_UNSOLICITED; |
| 531 | goto leave; |
| 532 | } else if (!strcmp(push_cert_nonce, nonce)) { |
| 533 | retval = NONCE_OK; |
| 534 | goto leave; |
| 535 | } |
| 536 | |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 537 | if (!stateless_rpc) { |
| 538 | /* returned nonce MUST match what we gave out earlier */ |
| 539 | retval = NONCE_BAD; |
| 540 | goto leave; |
| 541 | } |
| 542 | |
| 543 | /* |
| 544 | * In stateless mode, we may be receiving a nonce issued by |
| 545 | * another instance of the server that serving the same |
| 546 | * repository, and the timestamps may not match, but the |
| 547 | * nonce-seed and dir should match, so we can recompute and |
| 548 | * report the time slop. |
| 549 | * |
| 550 | * In addition, when a nonce issued by another instance has |
| 551 | * timestamp within receive.certnonceslop seconds, we pretend |
| 552 | * as if we issued that nonce when reporting to the hook. |
| 553 | */ |
| 554 | |
| 555 | /* nonce is concat(<seconds-since-epoch>, "-", <hmac>) */ |
| 556 | if (*nonce <= '0' || '9' < *nonce) { |
| 557 | retval = NONCE_BAD; |
| 558 | goto leave; |
| 559 | } |
Johannes Schindelin | 1aeb7e7 | 2017-04-21 12:45:44 +0200 | [diff] [blame] | 560 | stamp = parse_timestamp(nonce, &bohmac, 10); |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 561 | if (bohmac == nonce || bohmac[0] != '-') { |
| 562 | retval = NONCE_BAD; |
| 563 | goto leave; |
| 564 | } |
| 565 | |
brian m. carlson | edc6dcc | 2020-04-09 23:37:30 +0000 | [diff] [blame] | 566 | noncelen = strlen(nonce); |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 567 | expect = prepare_push_cert_nonce(service_dir, stamp); |
brian m. carlson | edc6dcc | 2020-04-09 23:37:30 +0000 | [diff] [blame] | 568 | if (noncelen != strlen(expect)) { |
| 569 | /* This is not even the right size. */ |
| 570 | retval = NONCE_BAD; |
| 571 | goto leave; |
| 572 | } |
| 573 | if (constant_memequal(expect, nonce, noncelen)) { |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 574 | /* Not what we would have signed earlier */ |
| 575 | retval = NONCE_BAD; |
| 576 | goto leave; |
| 577 | } |
| 578 | |
| 579 | /* |
| 580 | * By how many seconds is this nonce stale? Negative value |
| 581 | * would mean it was issued by another server with its clock |
| 582 | * skewed in the future. |
| 583 | */ |
Johannes Schindelin | 1aeb7e7 | 2017-04-21 12:45:44 +0200 | [diff] [blame] | 584 | ostamp = parse_timestamp(push_cert_nonce, NULL, 10); |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 585 | nonce_stamp_slop = (long)ostamp - (long)stamp; |
| 586 | |
| 587 | if (nonce_stamp_slop_limit && |
René Scharfe | 31a8aa1 | 2014-11-15 14:27:21 +0100 | [diff] [blame] | 588 | labs(nonce_stamp_slop) <= nonce_stamp_slop_limit) { |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 589 | /* |
| 590 | * Pretend as if the received nonce (which passes the |
| 591 | * HMAC check, so it is not a forged by third-party) |
| 592 | * is what we issued. |
| 593 | */ |
| 594 | free((void *)push_cert_nonce); |
| 595 | push_cert_nonce = xstrdup(nonce); |
| 596 | retval = NONCE_OK; |
| 597 | } else { |
| 598 | retval = NONCE_SLOP; |
| 599 | } |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 600 | |
| 601 | leave: |
| 602 | free(nonce); |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 603 | free(expect); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 604 | return retval; |
| 605 | } |
| 606 | |
Jonathan Tan | cbaf82c | 2017-05-09 12:23:53 -0700 | [diff] [blame] | 607 | /* |
| 608 | * Return 1 if there is no push_cert or if the push options in push_cert are |
| 609 | * the same as those in the argument; 0 otherwise. |
| 610 | */ |
| 611 | static int check_cert_push_options(const struct string_list *push_options) |
| 612 | { |
| 613 | const char *buf = push_cert.buf; |
| 614 | int len = push_cert.len; |
| 615 | |
| 616 | char *option; |
| 617 | const char *next_line; |
| 618 | int options_seen = 0; |
| 619 | |
| 620 | int retval = 1; |
| 621 | |
| 622 | if (!len) |
| 623 | return 1; |
| 624 | |
| 625 | while ((option = find_header(buf, len, "push-option", &next_line))) { |
| 626 | len -= (next_line - buf); |
| 627 | buf = next_line; |
| 628 | options_seen++; |
| 629 | if (options_seen > push_options->nr |
| 630 | || strcmp(option, |
| 631 | push_options->items[options_seen - 1].string)) { |
| 632 | retval = 0; |
| 633 | goto leave; |
| 634 | } |
| 635 | free(option); |
| 636 | } |
| 637 | |
| 638 | if (options_seen != push_options->nr) |
| 639 | retval = 0; |
| 640 | |
| 641 | leave: |
| 642 | free(option); |
| 643 | return retval; |
| 644 | } |
| 645 | |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 646 | static void prepare_push_cert_sha1(struct child_process *proc) |
| 647 | { |
| 648 | static int already_done; |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 649 | |
| 650 | if (!push_cert.len) |
| 651 | return; |
| 652 | |
| 653 | if (!already_done) { |
Junio C Hamano | d05b961 | 2014-08-14 15:59:21 -0700 | [diff] [blame] | 654 | int bogs /* beginning_of_gpg_sig */; |
| 655 | |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 656 | already_done = 1; |
Patryk Obara | a09c985 | 2018-01-28 01:13:19 +0100 | [diff] [blame] | 657 | if (write_object_file(push_cert.buf, push_cert.len, "blob", |
| 658 | &push_cert_oid)) |
| 659 | oidclr(&push_cert_oid); |
Junio C Hamano | d05b961 | 2014-08-14 15:59:21 -0700 | [diff] [blame] | 660 | |
| 661 | memset(&sigcheck, '\0', sizeof(sigcheck)); |
Junio C Hamano | d05b961 | 2014-08-14 15:59:21 -0700 | [diff] [blame] | 662 | |
| 663 | bogs = parse_signature(push_cert.buf, push_cert.len); |
Henning Schild | 3b9291e | 2018-07-11 10:38:24 +0200 | [diff] [blame] | 664 | check_signature(push_cert.buf, bogs, push_cert.buf + bogs, |
| 665 | push_cert.len - bogs, &sigcheck); |
Junio C Hamano | d05b961 | 2014-08-14 15:59:21 -0700 | [diff] [blame] | 666 | |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 667 | nonce_status = check_nonce(push_cert.buf, bogs); |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 668 | } |
Patryk Obara | a09c985 | 2018-01-28 01:13:19 +0100 | [diff] [blame] | 669 | if (!is_null_oid(&push_cert_oid)) { |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 670 | strvec_pushf(&proc->env_array, "GIT_PUSH_CERT=%s", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 671 | oid_to_hex(&push_cert_oid)); |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 672 | strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 673 | sigcheck.signer ? sigcheck.signer : ""); |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 674 | strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 675 | sigcheck.key ? sigcheck.key : ""); |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 676 | strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_STATUS=%c", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 677 | sigcheck.result); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 678 | if (push_cert_nonce) { |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 679 | strvec_pushf(&proc->env_array, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 680 | "GIT_PUSH_CERT_NONCE=%s", |
| 681 | push_cert_nonce); |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 682 | strvec_pushf(&proc->env_array, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 683 | "GIT_PUSH_CERT_NONCE_STATUS=%s", |
| 684 | nonce_status); |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 685 | if (nonce_status == NONCE_SLOP) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 686 | strvec_pushf(&proc->env_array, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 687 | "GIT_PUSH_CERT_NONCE_SLOP=%ld", |
| 688 | nonce_stamp_slop); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 689 | } |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 690 | } |
| 691 | } |
| 692 | |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 693 | struct receive_hook_feed_state { |
| 694 | struct command *cmd; |
| 695 | int skip_broken; |
| 696 | struct strbuf buf; |
| 697 | const struct string_list *push_options; |
| 698 | }; |
| 699 | |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 700 | typedef int (*feed_fn)(void *, const char **, size_t *); |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 701 | static int run_and_feed_hook(const char *hook_name, feed_fn feed, |
| 702 | struct receive_hook_feed_state *feed_state) |
Josef Weidendorfer | b1bf95b | 2005-07-31 21:17:43 +0200 | [diff] [blame] | 703 | { |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 704 | struct child_process proc = CHILD_PROCESS_INIT; |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 705 | struct async muxer; |
Shawn O. Pearce | f43cd49 | 2007-03-10 03:28:16 -0500 | [diff] [blame] | 706 | const char *argv[2]; |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 707 | int code; |
Josef Weidendorfer | b1bf95b | 2005-07-31 21:17:43 +0200 | [diff] [blame] | 708 | |
Aaron Schrab | 5a7da2d | 2013-01-13 00:17:02 -0500 | [diff] [blame] | 709 | argv[0] = find_hook(hook_name); |
| 710 | if (!argv[0]) |
Josef Weidendorfer | b1bf95b | 2005-07-31 21:17:43 +0200 | [diff] [blame] | 711 | return 0; |
Shawn O. Pearce | c8dd277 | 2007-03-07 16:51:09 -0500 | [diff] [blame] | 712 | |
Shawn O. Pearce | f43cd49 | 2007-03-10 03:28:16 -0500 | [diff] [blame] | 713 | argv[1] = NULL; |
| 714 | |
Shawn O. Pearce | f43cd49 | 2007-03-10 03:28:16 -0500 | [diff] [blame] | 715 | proc.argv = argv; |
| 716 | proc.in = -1; |
| 717 | proc.stdout_to_stderr = 1; |
Jeff Hostetler | 6206286 | 2019-02-22 14:25:06 -0800 | [diff] [blame] | 718 | proc.trace2_hook_name = hook_name; |
| 719 | |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 720 | if (feed_state->push_options) { |
| 721 | int i; |
| 722 | for (i = 0; i < feed_state->push_options->nr; i++) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 723 | strvec_pushf(&proc.env_array, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 724 | "GIT_PUSH_OPTION_%d=%s", i, |
| 725 | feed_state->push_options->items[i].string); |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 726 | strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 727 | feed_state->push_options->nr); |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 728 | } else |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 729 | strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT"); |
Shawn O. Pearce | f43cd49 | 2007-03-10 03:28:16 -0500 | [diff] [blame] | 730 | |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 731 | if (tmp_objdir) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 732 | strvec_pushv(&proc.env_array, tmp_objdir_env(tmp_objdir)); |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 733 | |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 734 | if (use_sideband) { |
| 735 | memset(&muxer, 0, sizeof(muxer)); |
| 736 | muxer.proc = copy_to_sideband; |
| 737 | muxer.in = -1; |
| 738 | code = start_async(&muxer); |
| 739 | if (code) |
| 740 | return code; |
| 741 | proc.err = muxer.in; |
| 742 | } |
| 743 | |
René Scharfe | 5d222c0 | 2014-10-28 21:27:54 +0100 | [diff] [blame] | 744 | prepare_push_cert_sha1(&proc); |
| 745 | |
Shawn O. Pearce | f43cd49 | 2007-03-10 03:28:16 -0500 | [diff] [blame] | 746 | code = start_command(&proc); |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 747 | if (code) { |
| 748 | if (use_sideband) |
| 749 | finish_async(&muxer); |
Johannes Sixt | 90e41a8 | 2009-07-04 21:26:43 +0200 | [diff] [blame] | 750 | return code; |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 751 | } |
| 752 | |
Junio C Hamano | ec7dbd1 | 2014-09-12 15:48:07 -0700 | [diff] [blame] | 753 | sigchain_push(SIGPIPE, SIG_IGN); |
| 754 | |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 755 | while (1) { |
| 756 | const char *buf; |
| 757 | size_t n; |
| 758 | if (feed(feed_state, &buf, &n)) |
| 759 | break; |
Jeff King | 06f46f2 | 2017-09-13 13:16:03 -0400 | [diff] [blame] | 760 | if (write_in_full(proc.in, buf, n) < 0) |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 761 | break; |
Shawn O. Pearce | c8dd277 | 2007-03-07 16:51:09 -0500 | [diff] [blame] | 762 | } |
Johannes Sixt | e72ae28 | 2008-02-16 18:36:38 +0100 | [diff] [blame] | 763 | close(proc.in); |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 764 | if (use_sideband) |
| 765 | finish_async(&muxer); |
Junio C Hamano | ec7dbd1 | 2014-09-12 15:48:07 -0700 | [diff] [blame] | 766 | |
| 767 | sigchain_pop(SIGPIPE); |
| 768 | |
Johannes Sixt | 90e41a8 | 2009-07-04 21:26:43 +0200 | [diff] [blame] | 769 | return finish_command(&proc); |
Josef Weidendorfer | b1bf95b | 2005-07-31 21:17:43 +0200 | [diff] [blame] | 770 | } |
| 771 | |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 772 | static int feed_receive_hook(void *state_, const char **bufp, size_t *sizep) |
| 773 | { |
| 774 | struct receive_hook_feed_state *state = state_; |
| 775 | struct command *cmd = state->cmd; |
| 776 | |
Junio C Hamano | cdc2b2f | 2011-10-17 21:37:10 -0700 | [diff] [blame] | 777 | while (cmd && |
| 778 | state->skip_broken && (cmd->error_string || cmd->did_not_exist)) |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 779 | cmd = cmd->next; |
| 780 | if (!cmd) |
| 781 | return -1; /* EOF */ |
| 782 | strbuf_reset(&state->buf); |
| 783 | strbuf_addf(&state->buf, "%s %s %s\n", |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 784 | oid_to_hex(&cmd->old_oid), oid_to_hex(&cmd->new_oid), |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 785 | cmd->ref_name); |
| 786 | state->cmd = cmd->next; |
| 787 | if (bufp) { |
| 788 | *bufp = state->buf.buf; |
| 789 | *sizep = state->buf.len; |
| 790 | } |
| 791 | return 0; |
| 792 | } |
| 793 | |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 794 | static int run_receive_hook(struct command *commands, |
| 795 | const char *hook_name, |
| 796 | int skip_broken, |
| 797 | const struct string_list *push_options) |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 798 | { |
| 799 | struct receive_hook_feed_state state; |
| 800 | int status; |
| 801 | |
| 802 | strbuf_init(&state.buf, 0); |
| 803 | state.cmd = commands; |
Junio C Hamano | cdc2b2f | 2011-10-17 21:37:10 -0700 | [diff] [blame] | 804 | state.skip_broken = skip_broken; |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 805 | if (feed_receive_hook(&state, NULL, NULL)) |
| 806 | return 0; |
| 807 | state.cmd = commands; |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 808 | state.push_options = push_options; |
Junio C Hamano | 9684e44 | 2011-09-08 12:17:09 -0700 | [diff] [blame] | 809 | status = run_and_feed_hook(hook_name, feed_receive_hook, &state); |
| 810 | strbuf_release(&state.buf); |
| 811 | return status; |
| 812 | } |
| 813 | |
Shawn O. Pearce | 1d9e8b5 | 2007-03-10 03:28:13 -0500 | [diff] [blame] | 814 | static int run_update_hook(struct command *cmd) |
| 815 | { |
Shawn O. Pearce | 1d9e8b5 | 2007-03-10 03:28:13 -0500 | [diff] [blame] | 816 | const char *argv[5]; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 817 | struct child_process proc = CHILD_PROCESS_INIT; |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 818 | int code; |
Shawn O. Pearce | 1d9e8b5 | 2007-03-10 03:28:13 -0500 | [diff] [blame] | 819 | |
Aaron Schrab | 5a7da2d | 2013-01-13 00:17:02 -0500 | [diff] [blame] | 820 | argv[0] = find_hook("update"); |
| 821 | if (!argv[0]) |
Shawn O. Pearce | 1d9e8b5 | 2007-03-10 03:28:13 -0500 | [diff] [blame] | 822 | return 0; |
| 823 | |
Shawn O. Pearce | 1d9e8b5 | 2007-03-10 03:28:13 -0500 | [diff] [blame] | 824 | argv[1] = cmd->ref_name; |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 825 | argv[2] = oid_to_hex(&cmd->old_oid); |
| 826 | argv[3] = oid_to_hex(&cmd->new_oid); |
Shawn O. Pearce | 1d9e8b5 | 2007-03-10 03:28:13 -0500 | [diff] [blame] | 827 | argv[4] = NULL; |
| 828 | |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 829 | proc.no_stdin = 1; |
| 830 | proc.stdout_to_stderr = 1; |
| 831 | proc.err = use_sideband ? -1 : 0; |
| 832 | proc.argv = argv; |
Jeff Hostetler | 6206286 | 2019-02-22 14:25:06 -0800 | [diff] [blame] | 833 | proc.trace2_hook_name = "update"; |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 834 | |
| 835 | code = start_command(&proc); |
| 836 | if (code) |
| 837 | return code; |
| 838 | if (use_sideband) |
| 839 | copy_to_sideband(proc.err, -1, NULL); |
| 840 | return finish_command(&proc); |
Shawn O. Pearce | 1d9e8b5 | 2007-03-10 03:28:13 -0500 | [diff] [blame] | 841 | } |
| 842 | |
Vasco Almeida | 8ba35a2 | 2016-09-15 14:59:05 +0000 | [diff] [blame] | 843 | static char *refuse_unconfigured_deny_msg = |
| 844 | N_("By default, updating the current branch in a non-bare repository\n" |
| 845 | "is denied, because it will make the index and work tree inconsistent\n" |
| 846 | "with what you pushed, and will require 'git reset --hard' to match\n" |
| 847 | "the work tree to HEAD.\n" |
| 848 | "\n" |
Alex Henrie | 2ddaa42 | 2016-12-04 15:04:40 -0700 | [diff] [blame] | 849 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
| 850 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" |
Vasco Almeida | 8ba35a2 | 2016-09-15 14:59:05 +0000 | [diff] [blame] | 851 | "its current branch; however, this is not recommended unless you\n" |
| 852 | "arranged to update its work tree to match what you pushed in some\n" |
| 853 | "other way.\n" |
| 854 | "\n" |
| 855 | "To squelch this message and still keep the default behaviour, set\n" |
| 856 | "'receive.denyCurrentBranch' configuration variable to 'refuse'."); |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 857 | |
Junio C Hamano | acd2a45 | 2009-02-11 02:28:03 -0800 | [diff] [blame] | 858 | static void refuse_unconfigured_deny(void) |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 859 | { |
Vasco Almeida | 8ba35a2 | 2016-09-15 14:59:05 +0000 | [diff] [blame] | 860 | rp_error("%s", _(refuse_unconfigured_deny_msg)); |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 861 | } |
| 862 | |
Vasco Almeida | 8ba35a2 | 2016-09-15 14:59:05 +0000 | [diff] [blame] | 863 | static char *refuse_unconfigured_deny_delete_current_msg = |
| 864 | N_("By default, deleting the current branch is denied, because the next\n" |
| 865 | "'git clone' won't result in any file checked out, causing confusion.\n" |
| 866 | "\n" |
| 867 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" |
| 868 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" |
| 869 | "current branch, with or without a warning message.\n" |
| 870 | "\n" |
| 871 | "To squelch this message, you can set it to 'refuse'."); |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 872 | |
Junio C Hamano | 375881f | 2009-02-09 00:19:46 -0800 | [diff] [blame] | 873 | static void refuse_unconfigured_deny_delete_current(void) |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 874 | { |
Vasco Almeida | 8ba35a2 | 2016-09-15 14:59:05 +0000 | [diff] [blame] | 875 | rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg)); |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 876 | } |
| 877 | |
brian m. carlson | 6ccac9e | 2017-10-15 22:06:54 +0000 | [diff] [blame] | 878 | static int command_singleton_iterator(void *cb_data, struct object_id *oid); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 879 | static int update_shallow_ref(struct command *cmd, struct shallow_info *si) |
| 880 | { |
Taylor Blau | cac4b8e | 2020-04-30 13:48:57 -0600 | [diff] [blame] | 881 | struct shallow_lock shallow_lock = SHALLOW_LOCK_INIT; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 882 | struct oid_array extra = OID_ARRAY_INIT; |
Jeff King | 7043c70 | 2016-07-15 06:30:40 -0400 | [diff] [blame] | 883 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 884 | uint32_t mask = 1 << (cmd->index % 32); |
| 885 | int i; |
| 886 | |
Karsten Blees | 6aa3085 | 2014-07-12 02:00:06 +0200 | [diff] [blame] | 887 | trace_printf_key(&trace_shallow, |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 888 | "shallow: update_shallow_ref %s\n", cmd->ref_name); |
| 889 | for (i = 0; i < si->shallow->nr; i++) |
| 890 | if (si->used_shallow[i] && |
| 891 | (si->used_shallow[i][cmd->index / 32] & mask) && |
| 892 | !delayed_reachability_test(si, i)) |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 893 | oid_array_append(&extra, &si->shallow->oid[i]); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 894 | |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 895 | opt.env = tmp_objdir_env(tmp_objdir); |
Jeff King | 7043c70 | 2016-07-15 06:30:40 -0400 | [diff] [blame] | 896 | setup_alternate_shallow(&shallow_lock, &opt.shallow_file, &extra); |
| 897 | if (check_connected(command_singleton_iterator, cmd, &opt)) { |
Taylor Blau | 37b9dca | 2020-04-22 18:25:45 -0600 | [diff] [blame] | 898 | rollback_shallow_file(the_repository, &shallow_lock); |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 899 | oid_array_clear(&extra); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 900 | return -1; |
| 901 | } |
| 902 | |
Taylor Blau | 37b9dca | 2020-04-22 18:25:45 -0600 | [diff] [blame] | 903 | commit_shallow_file(the_repository, &shallow_lock); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 904 | |
| 905 | /* |
| 906 | * Make sure setup_alternate_shallow() for the next ref does |
| 907 | * not lose these new roots.. |
| 908 | */ |
| 909 | for (i = 0; i < extra.nr; i++) |
Stefan Beller | 19143f1 | 2018-05-17 15:51:44 -0700 | [diff] [blame] | 910 | register_shallow(the_repository, &extra.oid[i]); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 911 | |
| 912 | si->shallow_ref[cmd->index] = 0; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 913 | oid_array_clear(&extra); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 914 | return 0; |
| 915 | } |
| 916 | |
Junio C Hamano | 1a51b52 | 2015-03-31 23:15:45 -0700 | [diff] [blame] | 917 | /* |
| 918 | * NEEDSWORK: we should consolidate various implementions of "are we |
| 919 | * on an unborn branch?" test into one, and make the unified one more |
| 920 | * robust. !get_sha1() based check used here and elsewhere would not |
| 921 | * allow us to tell an unborn branch from corrupt ref, for example. |
| 922 | * For the purpose of fixing "deploy-to-update does not work when |
| 923 | * pushing into an empty repository" issue, this should suffice for |
| 924 | * now. |
| 925 | */ |
| 926 | static int head_has_history(void) |
| 927 | { |
brian m. carlson | 15be4a5 | 2017-07-13 23:49:27 +0000 | [diff] [blame] | 928 | struct object_id oid; |
Junio C Hamano | 1a51b52 | 2015-03-31 23:15:45 -0700 | [diff] [blame] | 929 | |
brian m. carlson | 15be4a5 | 2017-07-13 23:49:27 +0000 | [diff] [blame] | 930 | return !get_oid("HEAD", &oid); |
Junio C Hamano | 1a51b52 | 2015-03-31 23:15:45 -0700 | [diff] [blame] | 931 | } |
| 932 | |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 933 | static const char *push_to_deploy(unsigned char *sha1, |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 934 | struct strvec *env, |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 935 | const char *work_tree) |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 936 | { |
| 937 | const char *update_refresh[] = { |
| 938 | "update-index", "-q", "--ignore-submodules", "--refresh", NULL |
| 939 | }; |
| 940 | const char *diff_files[] = { |
| 941 | "diff-files", "--quiet", "--ignore-submodules", "--", NULL |
| 942 | }; |
| 943 | const char *diff_index[] = { |
| 944 | "diff-index", "--quiet", "--cached", "--ignore-submodules", |
Junio C Hamano | 1a51b52 | 2015-03-31 23:15:45 -0700 | [diff] [blame] | 945 | NULL, "--", NULL |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 946 | }; |
| 947 | const char *read_tree[] = { |
| 948 | "read-tree", "-u", "-m", NULL, NULL |
| 949 | }; |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 950 | struct child_process child = CHILD_PROCESS_INIT; |
| 951 | |
| 952 | child.argv = update_refresh; |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 953 | child.env = env->v; |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 954 | child.dir = work_tree; |
| 955 | child.no_stdin = 1; |
| 956 | child.stdout_to_stderr = 1; |
| 957 | child.git_cmd = 1; |
| 958 | if (run_command(&child)) |
| 959 | return "Up-to-date check failed"; |
| 960 | |
| 961 | /* run_command() does not clean up completely; reinitialize */ |
| 962 | child_process_init(&child); |
| 963 | child.argv = diff_files; |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 964 | child.env = env->v; |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 965 | child.dir = work_tree; |
| 966 | child.no_stdin = 1; |
| 967 | child.stdout_to_stderr = 1; |
| 968 | child.git_cmd = 1; |
| 969 | if (run_command(&child)) |
| 970 | return "Working directory has unstaged changes"; |
| 971 | |
Junio C Hamano | 1a51b52 | 2015-03-31 23:15:45 -0700 | [diff] [blame] | 972 | /* diff-index with either HEAD or an empty tree */ |
brian m. carlson | c00866a | 2018-05-02 00:26:01 +0000 | [diff] [blame] | 973 | diff_index[4] = head_has_history() ? "HEAD" : empty_tree_oid_hex(); |
Junio C Hamano | 1a51b52 | 2015-03-31 23:15:45 -0700 | [diff] [blame] | 974 | |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 975 | child_process_init(&child); |
| 976 | child.argv = diff_index; |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 977 | child.env = env->v; |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 978 | child.no_stdin = 1; |
| 979 | child.no_stdout = 1; |
| 980 | child.stdout_to_stderr = 0; |
| 981 | child.git_cmd = 1; |
| 982 | if (run_command(&child)) |
| 983 | return "Working directory has staged changes"; |
| 984 | |
brian m. carlson | fc06be3 | 2019-08-18 20:04:24 +0000 | [diff] [blame] | 985 | read_tree[3] = hash_to_hex(sha1); |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 986 | child_process_init(&child); |
| 987 | child.argv = read_tree; |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 988 | child.env = env->v; |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 989 | child.dir = work_tree; |
| 990 | child.no_stdin = 1; |
| 991 | child.no_stdout = 1; |
| 992 | child.stdout_to_stderr = 0; |
| 993 | child.git_cmd = 1; |
| 994 | if (run_command(&child)) |
| 995 | return "Could not update working tree to new HEAD"; |
| 996 | |
| 997 | return NULL; |
| 998 | } |
| 999 | |
Junio C Hamano | 0855331 | 2014-12-01 15:29:54 -0800 | [diff] [blame] | 1000 | static const char *push_to_checkout_hook = "push-to-checkout"; |
| 1001 | |
brian m. carlson | fc06be3 | 2019-08-18 20:04:24 +0000 | [diff] [blame] | 1002 | static const char *push_to_checkout(unsigned char *hash, |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1003 | struct strvec *env, |
Junio C Hamano | 0855331 | 2014-12-01 15:29:54 -0800 | [diff] [blame] | 1004 | const char *work_tree) |
| 1005 | { |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1006 | strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree)); |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 1007 | if (run_hook_le(env->v, push_to_checkout_hook, |
brian m. carlson | fc06be3 | 2019-08-18 20:04:24 +0000 | [diff] [blame] | 1008 | hash_to_hex(hash), NULL)) |
Junio C Hamano | 0855331 | 2014-12-01 15:29:54 -0800 | [diff] [blame] | 1009 | return "push-to-checkout hook declined"; |
| 1010 | else |
| 1011 | return NULL; |
| 1012 | } |
| 1013 | |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 1014 | static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree) |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 1015 | { |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 1016 | const char *retval, *work_tree, *git_dir = NULL; |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1017 | struct strvec env = STRVEC_INIT; |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1018 | |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 1019 | if (worktree && worktree->path) |
| 1020 | work_tree = worktree->path; |
| 1021 | else if (git_work_tree_cfg) |
| 1022 | work_tree = git_work_tree_cfg; |
| 1023 | else |
| 1024 | work_tree = ".."; |
| 1025 | |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1026 | if (is_bare_repository()) |
| 1027 | return "denyCurrentBranch = updateInstead needs a worktree"; |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 1028 | if (worktree) |
| 1029 | git_dir = get_worktree_git_dir(worktree); |
| 1030 | if (!git_dir) |
| 1031 | git_dir = get_git_dir(); |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1032 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1033 | strvec_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir)); |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1034 | |
Junio C Hamano | 0855331 | 2014-12-01 15:29:54 -0800 | [diff] [blame] | 1035 | if (!find_hook(push_to_checkout_hook)) |
| 1036 | retval = push_to_deploy(sha1, &env, work_tree); |
| 1037 | else |
| 1038 | retval = push_to_checkout(sha1, &env, work_tree); |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1039 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1040 | strvec_clear(&env); |
Junio C Hamano | 21b138d | 2014-12-01 13:57:28 -0800 | [diff] [blame] | 1041 | return retval; |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1042 | } |
| 1043 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1044 | static const char *update(struct command *cmd, struct shallow_info *si) |
Linus Torvalds | 2eca23d | 2005-06-30 10:15:22 -0700 | [diff] [blame] | 1045 | { |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1046 | const char *name = cmd->ref_name; |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 1047 | struct strbuf namespaced_name_buf = STRBUF_INIT; |
Johannes Schindelin | bda6e82 | 2017-05-04 15:57:55 +0200 | [diff] [blame] | 1048 | static char *namespaced_name; |
| 1049 | const char *ret; |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1050 | struct object_id *old_oid = &cmd->old_oid; |
| 1051 | struct object_id *new_oid = &cmd->new_oid; |
Junio C Hamano | b072a25 | 2018-10-19 13:57:35 +0900 | [diff] [blame] | 1052 | int do_update_worktree = 0; |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 1053 | const struct worktree *worktree = is_bare_repository() ? NULL : find_shared_symref("HEAD", name); |
Linus Torvalds | 2eca23d | 2005-06-30 10:15:22 -0700 | [diff] [blame] | 1054 | |
Martin Koegler | 061d6b9 | 2008-01-04 20:37:17 +0100 | [diff] [blame] | 1055 | /* only refs/... are allowed */ |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1056 | if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) { |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 1057 | rp_error("refusing to create funny ref '%s' remotely", name); |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1058 | return "funny refname"; |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1059 | } |
Junio C Hamano | d8a1dee | 2005-10-13 18:57:39 -0700 | [diff] [blame] | 1060 | |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 1061 | strbuf_addf(&namespaced_name_buf, "%s%s", get_git_namespace(), name); |
Johannes Schindelin | bda6e82 | 2017-05-04 15:57:55 +0200 | [diff] [blame] | 1062 | free(namespaced_name); |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 1063 | namespaced_name = strbuf_detach(&namespaced_name_buf, NULL); |
| 1064 | |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 1065 | if (worktree) { |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 1066 | switch (deny_current_branch) { |
| 1067 | case DENY_IGNORE: |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 1068 | break; |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 1069 | case DENY_WARN: |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 1070 | rp_warning("updating the current branch"); |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 1071 | break; |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 1072 | case DENY_REFUSE: |
Junio C Hamano | acd2a45 | 2009-02-11 02:28:03 -0800 | [diff] [blame] | 1073 | case DENY_UNCONFIGURED: |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 1074 | rp_error("refusing to update checked out branch: %s", name); |
Junio C Hamano | acd2a45 | 2009-02-11 02:28:03 -0800 | [diff] [blame] | 1075 | if (deny_current_branch == DENY_UNCONFIGURED) |
| 1076 | refuse_unconfigured_deny(); |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 1077 | return "branch is currently checked out"; |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1078 | case DENY_UPDATE_INSTEAD: |
Junio C Hamano | b072a25 | 2018-10-19 13:57:35 +0900 | [diff] [blame] | 1079 | /* pass -- let other checks intervene first */ |
| 1080 | do_update_worktree = 1; |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1081 | break; |
Junio C Hamano | 3d95d92 | 2009-01-31 17:34:05 -0800 | [diff] [blame] | 1082 | } |
Jeff King | 986e823 | 2008-11-08 20:49:27 -0500 | [diff] [blame] | 1083 | } |
| 1084 | |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1085 | if (!is_null_oid(new_oid) && !has_object_file(new_oid)) { |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1086 | error("unpack should have generated %s, " |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1087 | "but I can't find it!", oid_to_hex(new_oid)); |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1088 | return "bad pack"; |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1089 | } |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 1090 | |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1091 | if (!is_null_oid(old_oid) && is_null_oid(new_oid)) { |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1092 | if (deny_deletes && starts_with(name, "refs/heads/")) { |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 1093 | rp_error("denying ref deletion for %s", name); |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 1094 | return "deletion prohibited"; |
| 1095 | } |
| 1096 | |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 1097 | if (worktree || (head_name && !strcmp(namespaced_name, head_name))) { |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 1098 | switch (deny_delete_current) { |
| 1099 | case DENY_IGNORE: |
| 1100 | break; |
| 1101 | case DENY_WARN: |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 1102 | rp_warning("deleting the current branch"); |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 1103 | break; |
| 1104 | case DENY_REFUSE: |
Junio C Hamano | 375881f | 2009-02-09 00:19:46 -0800 | [diff] [blame] | 1105 | case DENY_UNCONFIGURED: |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1106 | case DENY_UPDATE_INSTEAD: |
Junio C Hamano | 375881f | 2009-02-09 00:19:46 -0800 | [diff] [blame] | 1107 | if (deny_delete_current == DENY_UNCONFIGURED) |
| 1108 | refuse_unconfigured_deny_delete_current(); |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 1109 | rp_error("refusing to delete the current branch: %s", name); |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 1110 | return "deletion of the current branch prohibited"; |
Johannes Schindelin | 1404bcb | 2014-11-26 23:44:16 +0100 | [diff] [blame] | 1111 | default: |
| 1112 | return "Invalid denyDeleteCurrent setting"; |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 1113 | } |
| 1114 | } |
Jan Krüger | a240de1 | 2008-11-01 15:42:16 +0100 | [diff] [blame] | 1115 | } |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 1116 | |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1117 | if (deny_non_fast_forwards && !is_null_oid(new_oid) && |
| 1118 | !is_null_oid(old_oid) && |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1119 | starts_with(name, "refs/heads/")) { |
Martin Koegler | eab8270 | 2008-01-02 08:39:21 +0100 | [diff] [blame] | 1120 | struct object *old_object, *new_object; |
Johannes Schindelin | 11031d7 | 2006-09-21 01:07:54 +0200 | [diff] [blame] | 1121 | struct commit *old_commit, *new_commit; |
Johannes Schindelin | 11031d7 | 2006-09-21 01:07:54 +0200 | [diff] [blame] | 1122 | |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 1123 | old_object = parse_object(the_repository, old_oid); |
| 1124 | new_object = parse_object(the_repository, new_oid); |
Martin Koegler | eab8270 | 2008-01-02 08:39:21 +0100 | [diff] [blame] | 1125 | |
| 1126 | if (!old_object || !new_object || |
| 1127 | old_object->type != OBJ_COMMIT || |
| 1128 | new_object->type != OBJ_COMMIT) { |
| 1129 | error("bad sha1 objects for %s", name); |
| 1130 | return "bad ref"; |
| 1131 | } |
| 1132 | old_commit = (struct commit *)old_object; |
| 1133 | new_commit = (struct commit *)new_object; |
Junio C Hamano | 5d55915 | 2012-08-27 15:16:38 -0700 | [diff] [blame] | 1134 | if (!in_merge_bases(old_commit, new_commit)) { |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 1135 | rp_error("denying non-fast-forward %s" |
| 1136 | " (you should pull first)", name); |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 1137 | return "non-fast-forward"; |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1138 | } |
Johannes Schindelin | 11031d7 | 2006-09-21 01:07:54 +0200 | [diff] [blame] | 1139 | } |
Shawn O. Pearce | 1d9e8b5 | 2007-03-10 03:28:13 -0500 | [diff] [blame] | 1140 | if (run_update_hook(cmd)) { |
Shawn O. Pearce | 466dbc4 | 2010-02-10 09:34:12 -0800 | [diff] [blame] | 1141 | rp_error("hook declined to update %s", name); |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1142 | return "hook declined"; |
Josef Weidendorfer | b1bf95b | 2005-07-31 21:17:43 +0200 | [diff] [blame] | 1143 | } |
Junio C Hamano | 3159c8d | 2006-09-27 02:40:06 -0700 | [diff] [blame] | 1144 | |
Junio C Hamano | b072a25 | 2018-10-19 13:57:35 +0900 | [diff] [blame] | 1145 | if (do_update_worktree) { |
Hariom Verma | 4ef3464 | 2020-02-23 18:57:10 +0000 | [diff] [blame] | 1146 | ret = update_worktree(new_oid->hash, find_shared_symref("HEAD", name)); |
Junio C Hamano | b072a25 | 2018-10-19 13:57:35 +0900 | [diff] [blame] | 1147 | if (ret) |
| 1148 | return ret; |
| 1149 | } |
| 1150 | |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1151 | if (is_null_oid(new_oid)) { |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1152 | struct strbuf err = STRBUF_INIT; |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 1153 | if (!parse_object(the_repository, old_oid)) { |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1154 | old_oid = NULL; |
Pang Yan Han | 160b81e | 2011-09-28 23:39:35 +0800 | [diff] [blame] | 1155 | if (ref_exists(name)) { |
| 1156 | rp_warning("Allowing deletion of corrupt ref."); |
| 1157 | } else { |
| 1158 | rp_warning("Deleting a non-existent ref."); |
| 1159 | cmd->did_not_exist = 1; |
| 1160 | } |
Johannes Schindelin | 28391a8 | 2007-11-29 01:02:53 +0000 | [diff] [blame] | 1161 | } |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1162 | if (ref_transaction_delete(transaction, |
| 1163 | namespaced_name, |
brian m. carlson | 89f3bbd | 2017-10-15 22:06:53 +0000 | [diff] [blame] | 1164 | old_oid, |
Michael Haggerty | fb5a6bb | 2015-02-17 18:00:16 +0100 | [diff] [blame] | 1165 | 0, "push", &err)) { |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1166 | rp_error("%s", err.buf); |
| 1167 | strbuf_release(&err); |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1168 | return "failed to delete"; |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 1169 | } |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1170 | strbuf_release(&err); |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1171 | return NULL; /* good */ |
Linus Torvalds | 2eca23d | 2005-06-30 10:15:22 -0700 | [diff] [blame] | 1172 | } |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 1173 | else { |
Ronnie Sahlberg | 6629ea2 | 2014-04-28 14:36:15 -0700 | [diff] [blame] | 1174 | struct strbuf err = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1175 | if (shallow_update && si->shallow_ref[cmd->index] && |
| 1176 | update_shallow_ref(cmd, si)) |
| 1177 | return "shallow error"; |
| 1178 | |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1179 | if (ref_transaction_update(transaction, |
| 1180 | namespaced_name, |
brian m. carlson | 89f3bbd | 2017-10-15 22:06:53 +0000 | [diff] [blame] | 1181 | new_oid, old_oid, |
Michael Haggerty | 1d147bd | 2015-02-17 18:00:15 +0100 | [diff] [blame] | 1182 | 0, "push", |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1183 | &err)) { |
Ronnie Sahlberg | 6629ea2 | 2014-04-28 14:36:15 -0700 | [diff] [blame] | 1184 | rp_error("%s", err.buf); |
| 1185 | strbuf_release(&err); |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1186 | |
Ronnie Sahlberg | 6629ea2 | 2014-04-28 14:36:15 -0700 | [diff] [blame] | 1187 | return "failed to update ref"; |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 1188 | } |
Ronnie Sahlberg | 6629ea2 | 2014-04-28 14:36:15 -0700 | [diff] [blame] | 1189 | strbuf_release(&err); |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1190 | |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1191 | return NULL; /* good */ |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 1192 | } |
Linus Torvalds | 2eca23d | 2005-06-30 10:15:22 -0700 | [diff] [blame] | 1193 | } |
| 1194 | |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1195 | static void run_update_post_hook(struct command *commands) |
Junio C Hamano | 1961433 | 2005-08-02 14:24:22 -0700 | [diff] [blame] | 1196 | { |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1197 | struct command *cmd; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 1198 | struct child_process proc = CHILD_PROCESS_INIT; |
Nguyễn Thái Ngọc Duy | dcf6926 | 2014-11-30 15:24:27 +0700 | [diff] [blame] | 1199 | const char *hook; |
Junio C Hamano | 1961433 | 2005-08-02 14:24:22 -0700 | [diff] [blame] | 1200 | |
Aaron Schrab | 5a7da2d | 2013-01-13 00:17:02 -0500 | [diff] [blame] | 1201 | hook = find_hook("post-update"); |
René Scharfe | dce96c4 | 2017-03-17 23:02:13 +0100 | [diff] [blame] | 1202 | if (!hook) |
Shawn O. Pearce | 3e6e152 | 2007-03-07 16:50:43 -0500 | [diff] [blame] | 1203 | return; |
Aaron Schrab | 5a7da2d | 2013-01-13 00:17:02 -0500 | [diff] [blame] | 1204 | |
Jeff King | 850d2fe | 2016-02-22 17:44:21 -0500 | [diff] [blame] | 1205 | for (cmd = commands; cmd; cmd = cmd->next) { |
Pang Yan Han | 160b81e | 2011-09-28 23:39:35 +0800 | [diff] [blame] | 1206 | if (cmd->error_string || cmd->did_not_exist) |
Junio C Hamano | 1961433 | 2005-08-02 14:24:22 -0700 | [diff] [blame] | 1207 | continue; |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 1208 | if (!proc.args.nr) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1209 | strvec_push(&proc.args, hook); |
| 1210 | strvec_push(&proc.args, cmd->ref_name); |
Junio C Hamano | 1961433 | 2005-08-02 14:24:22 -0700 | [diff] [blame] | 1211 | } |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 1212 | if (!proc.args.nr) |
René Scharfe | dce96c4 | 2017-03-17 23:02:13 +0100 | [diff] [blame] | 1213 | return; |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 1214 | |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 1215 | proc.no_stdin = 1; |
| 1216 | proc.stdout_to_stderr = 1; |
| 1217 | proc.err = use_sideband ? -1 : 0; |
Jeff Hostetler | 6206286 | 2019-02-22 14:25:06 -0800 | [diff] [blame] | 1218 | proc.trace2_hook_name = "post-update"; |
Shawn O. Pearce | 6d525d3 | 2010-02-05 12:57:42 -0800 | [diff] [blame] | 1219 | |
| 1220 | if (!start_command(&proc)) { |
| 1221 | if (use_sideband) |
| 1222 | copy_to_sideband(proc.err, -1, NULL); |
| 1223 | finish_command(&proc); |
| 1224 | } |
Junio C Hamano | 1961433 | 2005-08-02 14:24:22 -0700 | [diff] [blame] | 1225 | } |
Linus Torvalds | 2eca23d | 2005-06-30 10:15:22 -0700 | [diff] [blame] | 1226 | |
Ævar Arnfjörð Bjarmason | 9903623 | 2019-02-20 01:00:33 +0100 | [diff] [blame] | 1227 | static void check_aliased_update_internal(struct command *cmd, |
| 1228 | struct string_list *list, |
| 1229 | const char *dst_name, int flag) |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1230 | { |
| 1231 | struct string_list_item *item; |
| 1232 | struct command *dst_cmd; |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1233 | |
| 1234 | if (!(flag & REF_ISSYMREF)) |
| 1235 | return; |
| 1236 | |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 1237 | if (!dst_name) { |
| 1238 | rp_error("refusing update to broken symref '%s'", cmd->ref_name); |
| 1239 | cmd->skip_update = 1; |
| 1240 | cmd->error_string = "broken symref"; |
| 1241 | return; |
| 1242 | } |
Michael Haggerty | ded8393 | 2016-04-07 15:03:08 -0400 | [diff] [blame] | 1243 | dst_name = strip_namespace(dst_name); |
Josh Triplett | 6b01ecf | 2011-07-08 16:13:32 -0700 | [diff] [blame] | 1244 | |
Julian Phillips | e8c8b71 | 2010-06-26 00:41:37 +0100 | [diff] [blame] | 1245 | if ((item = string_list_lookup(list, dst_name)) == NULL) |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1246 | return; |
| 1247 | |
| 1248 | cmd->skip_update = 1; |
| 1249 | |
| 1250 | dst_cmd = (struct command *) item->util; |
| 1251 | |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 1252 | if (oideq(&cmd->old_oid, &dst_cmd->old_oid) && |
| 1253 | oideq(&cmd->new_oid, &dst_cmd->new_oid)) |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1254 | return; |
| 1255 | |
| 1256 | dst_cmd->skip_update = 1; |
| 1257 | |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1258 | rp_error("refusing inconsistent update between symref '%s' (%s..%s) and" |
| 1259 | " its target '%s' (%s..%s)", |
Jeff King | ef2ed50 | 2016-10-20 02:19:19 -0400 | [diff] [blame] | 1260 | cmd->ref_name, |
brian m. carlson | aab9583 | 2018-03-12 02:27:30 +0000 | [diff] [blame] | 1261 | find_unique_abbrev(&cmd->old_oid, DEFAULT_ABBREV), |
| 1262 | find_unique_abbrev(&cmd->new_oid, DEFAULT_ABBREV), |
Jeff King | ef2ed50 | 2016-10-20 02:19:19 -0400 | [diff] [blame] | 1263 | dst_cmd->ref_name, |
brian m. carlson | aab9583 | 2018-03-12 02:27:30 +0000 | [diff] [blame] | 1264 | find_unique_abbrev(&dst_cmd->old_oid, DEFAULT_ABBREV), |
| 1265 | find_unique_abbrev(&dst_cmd->new_oid, DEFAULT_ABBREV)); |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1266 | |
| 1267 | cmd->error_string = dst_cmd->error_string = |
| 1268 | "inconsistent aliased update"; |
| 1269 | } |
| 1270 | |
Ævar Arnfjörð Bjarmason | 9903623 | 2019-02-20 01:00:33 +0100 | [diff] [blame] | 1271 | static void check_aliased_update(struct command *cmd, struct string_list *list) |
| 1272 | { |
| 1273 | struct strbuf buf = STRBUF_INIT; |
| 1274 | const char *dst_name; |
| 1275 | int flag; |
| 1276 | |
| 1277 | strbuf_addf(&buf, "%s%s", get_git_namespace(), cmd->ref_name); |
| 1278 | dst_name = resolve_ref_unsafe(buf.buf, 0, NULL, &flag); |
| 1279 | check_aliased_update_internal(cmd, list, dst_name, flag); |
| 1280 | strbuf_release(&buf); |
| 1281 | } |
| 1282 | |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1283 | static void check_aliased_updates(struct command *commands) |
| 1284 | { |
| 1285 | struct command *cmd; |
Thiago Farina | 183113a | 2010-07-04 16:46:19 -0300 | [diff] [blame] | 1286 | struct string_list ref_list = STRING_LIST_INIT_NODUP; |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1287 | |
| 1288 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1289 | struct string_list_item *item = |
Julian Phillips | 1d2f80f | 2010-06-26 00:41:38 +0100 | [diff] [blame] | 1290 | string_list_append(&ref_list, cmd->ref_name); |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1291 | item->util = (void *)cmd; |
| 1292 | } |
Michael Haggerty | 3383e19 | 2014-11-25 09:02:35 +0100 | [diff] [blame] | 1293 | string_list_sort(&ref_list); |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1294 | |
Clemens Buchacher | ef7e93d | 2012-02-13 21:17:12 +0100 | [diff] [blame] | 1295 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1296 | if (!cmd->error_string) |
| 1297 | check_aliased_update(cmd, &ref_list); |
| 1298 | } |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1299 | |
| 1300 | string_list_clear(&ref_list, 0); |
| 1301 | } |
| 1302 | |
brian m. carlson | 6ccac9e | 2017-10-15 22:06:54 +0000 | [diff] [blame] | 1303 | static int command_singleton_iterator(void *cb_data, struct object_id *oid) |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1304 | { |
| 1305 | struct command **cmd_list = cb_data; |
| 1306 | struct command *cmd = *cmd_list; |
| 1307 | |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1308 | if (!cmd || is_null_oid(&cmd->new_oid)) |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1309 | return -1; /* end of list */ |
| 1310 | *cmd_list = NULL; /* this returns only one */ |
brian m. carlson | 6ccac9e | 2017-10-15 22:06:54 +0000 | [diff] [blame] | 1311 | oidcpy(oid, &cmd->new_oid); |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1312 | return 0; |
| 1313 | } |
| 1314 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1315 | static void set_connectivity_errors(struct command *commands, |
| 1316 | struct shallow_info *si) |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1317 | { |
| 1318 | struct command *cmd; |
| 1319 | |
| 1320 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1321 | struct command *singleton = cmd; |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1322 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
| 1323 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1324 | if (shallow_update && si->shallow_ref[cmd->index]) |
| 1325 | /* to be checked in update_shallow_ref() */ |
| 1326 | continue; |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1327 | |
| 1328 | opt.env = tmp_objdir_env(tmp_objdir); |
Jeff King | 7043c70 | 2016-07-15 06:30:40 -0400 | [diff] [blame] | 1329 | if (!check_connected(command_singleton_iterator, &singleton, |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1330 | &opt)) |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1331 | continue; |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1332 | |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1333 | cmd->error_string = "missing necessary objects"; |
| 1334 | } |
| 1335 | } |
| 1336 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1337 | struct iterate_data { |
| 1338 | struct command *cmds; |
| 1339 | struct shallow_info *si; |
| 1340 | }; |
| 1341 | |
brian m. carlson | 6ccac9e | 2017-10-15 22:06:54 +0000 | [diff] [blame] | 1342 | static int iterate_receive_command_list(void *cb_data, struct object_id *oid) |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1343 | { |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1344 | struct iterate_data *data = cb_data; |
| 1345 | struct command **cmd_list = &data->cmds; |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1346 | struct command *cmd = *cmd_list; |
| 1347 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1348 | for (; cmd; cmd = cmd->next) { |
| 1349 | if (shallow_update && data->si->shallow_ref[cmd->index]) |
| 1350 | /* to be checked in update_shallow_ref() */ |
| 1351 | continue; |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1352 | if (!is_null_oid(&cmd->new_oid) && !cmd->skip_update) { |
brian m. carlson | 6ccac9e | 2017-10-15 22:06:54 +0000 | [diff] [blame] | 1353 | oidcpy(oid, &cmd->new_oid); |
Junio C Hamano | ee6dfb2 | 2011-11-03 12:15:08 -0700 | [diff] [blame] | 1354 | *cmd_list = cmd->next; |
| 1355 | return 0; |
| 1356 | } |
Junio C Hamano | ee6dfb2 | 2011-11-03 12:15:08 -0700 | [diff] [blame] | 1357 | } |
| 1358 | *cmd_list = NULL; |
| 1359 | return -1; /* end of list */ |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1360 | } |
| 1361 | |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1362 | static void reject_updates_to_hidden(struct command *commands) |
| 1363 | { |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 1364 | struct strbuf refname_full = STRBUF_INIT; |
| 1365 | size_t prefix_len; |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1366 | struct command *cmd; |
| 1367 | |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 1368 | strbuf_addstr(&refname_full, get_git_namespace()); |
| 1369 | prefix_len = refname_full.len; |
| 1370 | |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1371 | for (cmd = commands; cmd; cmd = cmd->next) { |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 1372 | if (cmd->error_string) |
| 1373 | continue; |
| 1374 | |
| 1375 | strbuf_setlen(&refname_full, prefix_len); |
| 1376 | strbuf_addstr(&refname_full, cmd->ref_name); |
| 1377 | |
| 1378 | if (!ref_is_hidden(cmd->ref_name, refname_full.buf)) |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1379 | continue; |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1380 | if (is_null_oid(&cmd->new_oid)) |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1381 | cmd->error_string = "deny deleting a hidden ref"; |
| 1382 | else |
| 1383 | cmd->error_string = "deny updating a hidden ref"; |
| 1384 | } |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 1385 | |
| 1386 | strbuf_release(&refname_full); |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1387 | } |
| 1388 | |
Stefan Beller | a6a8431 | 2015-01-07 19:23:15 -0800 | [diff] [blame] | 1389 | static int should_process_cmd(struct command *cmd) |
| 1390 | { |
| 1391 | return !cmd->error_string && !cmd->skip_update; |
| 1392 | } |
| 1393 | |
| 1394 | static void warn_if_skipped_connectivity_check(struct command *commands, |
| 1395 | struct shallow_info *si) |
| 1396 | { |
| 1397 | struct command *cmd; |
| 1398 | int checked_connectivity = 1; |
| 1399 | |
| 1400 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1401 | if (should_process_cmd(cmd) && si->shallow_ref[cmd->index]) { |
| 1402 | error("BUG: connectivity check has not been run on ref %s", |
| 1403 | cmd->ref_name); |
| 1404 | checked_connectivity = 0; |
| 1405 | } |
| 1406 | } |
| 1407 | if (!checked_connectivity) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 1408 | BUG("connectivity check skipped???"); |
Stefan Beller | a6a8431 | 2015-01-07 19:23:15 -0800 | [diff] [blame] | 1409 | } |
| 1410 | |
Stefan Beller | a1a2614 | 2015-01-07 19:23:17 -0800 | [diff] [blame] | 1411 | static void execute_commands_non_atomic(struct command *commands, |
| 1412 | struct shallow_info *si) |
| 1413 | { |
| 1414 | struct command *cmd; |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1415 | struct strbuf err = STRBUF_INIT; |
| 1416 | |
Stefan Beller | a1a2614 | 2015-01-07 19:23:17 -0800 | [diff] [blame] | 1417 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1418 | if (!should_process_cmd(cmd)) |
| 1419 | continue; |
| 1420 | |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1421 | transaction = ref_transaction_begin(&err); |
| 1422 | if (!transaction) { |
| 1423 | rp_error("%s", err.buf); |
| 1424 | strbuf_reset(&err); |
| 1425 | cmd->error_string = "transaction failed to start"; |
| 1426 | continue; |
| 1427 | } |
| 1428 | |
Stefan Beller | a1a2614 | 2015-01-07 19:23:17 -0800 | [diff] [blame] | 1429 | cmd->error_string = update(cmd, si); |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1430 | |
| 1431 | if (!cmd->error_string |
| 1432 | && ref_transaction_commit(transaction, &err)) { |
| 1433 | rp_error("%s", err.buf); |
| 1434 | strbuf_reset(&err); |
| 1435 | cmd->error_string = "failed to update ref"; |
| 1436 | } |
| 1437 | ref_transaction_free(transaction); |
Stefan Beller | a1a2614 | 2015-01-07 19:23:17 -0800 | [diff] [blame] | 1438 | } |
Stefan Beller | 68deed2 | 2015-01-07 19:23:19 -0800 | [diff] [blame] | 1439 | strbuf_release(&err); |
| 1440 | } |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1441 | |
Stefan Beller | 68deed2 | 2015-01-07 19:23:19 -0800 | [diff] [blame] | 1442 | static void execute_commands_atomic(struct command *commands, |
| 1443 | struct shallow_info *si) |
| 1444 | { |
| 1445 | struct command *cmd; |
| 1446 | struct strbuf err = STRBUF_INIT; |
| 1447 | const char *reported_error = "atomic push failure"; |
| 1448 | |
| 1449 | transaction = ref_transaction_begin(&err); |
| 1450 | if (!transaction) { |
| 1451 | rp_error("%s", err.buf); |
| 1452 | strbuf_reset(&err); |
| 1453 | reported_error = "transaction failed to start"; |
| 1454 | goto failure; |
| 1455 | } |
| 1456 | |
| 1457 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1458 | if (!should_process_cmd(cmd)) |
| 1459 | continue; |
| 1460 | |
| 1461 | cmd->error_string = update(cmd, si); |
| 1462 | |
| 1463 | if (cmd->error_string) |
| 1464 | goto failure; |
| 1465 | } |
| 1466 | |
| 1467 | if (ref_transaction_commit(transaction, &err)) { |
| 1468 | rp_error("%s", err.buf); |
| 1469 | reported_error = "atomic transaction failed"; |
| 1470 | goto failure; |
| 1471 | } |
| 1472 | goto cleanup; |
| 1473 | |
| 1474 | failure: |
| 1475 | for (cmd = commands; cmd; cmd = cmd->next) |
| 1476 | if (!cmd->error_string) |
| 1477 | cmd->error_string = reported_error; |
| 1478 | |
| 1479 | cleanup: |
| 1480 | ref_transaction_free(transaction); |
Stefan Beller | 222368c | 2015-01-07 19:23:18 -0800 | [diff] [blame] | 1481 | strbuf_release(&err); |
Stefan Beller | a1a2614 | 2015-01-07 19:23:17 -0800 | [diff] [blame] | 1482 | } |
| 1483 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1484 | static void execute_commands(struct command *commands, |
| 1485 | const char *unpacker_error, |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 1486 | struct shallow_info *si, |
| 1487 | const struct string_list *push_options) |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1488 | { |
Jeff King | d415092 | 2016-07-15 06:36:14 -0400 | [diff] [blame] | 1489 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1490 | struct command *cmd; |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1491 | struct iterate_data data; |
Jeff King | d415092 | 2016-07-15 06:36:14 -0400 | [diff] [blame] | 1492 | struct async muxer; |
| 1493 | int err_fd = 0; |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1494 | |
| 1495 | if (unpacker_error) { |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1496 | for (cmd = commands; cmd; cmd = cmd->next) |
Jeff King | 74eb32d | 2012-09-21 01:38:46 -0400 | [diff] [blame] | 1497 | cmd->error_string = "unpacker error"; |
Shawn O. Pearce | 8aaf7d6 | 2007-03-07 16:51:59 -0500 | [diff] [blame] | 1498 | return; |
| 1499 | } |
| 1500 | |
Jeff King | d415092 | 2016-07-15 06:36:14 -0400 | [diff] [blame] | 1501 | if (use_sideband) { |
| 1502 | memset(&muxer, 0, sizeof(muxer)); |
| 1503 | muxer.proc = copy_to_sideband; |
| 1504 | muxer.in = -1; |
| 1505 | if (!start_async(&muxer)) |
| 1506 | err_fd = muxer.in; |
| 1507 | /* ...else, continue without relaying sideband */ |
| 1508 | } |
| 1509 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1510 | data.cmds = commands; |
| 1511 | data.si = si; |
Jeff King | d415092 | 2016-07-15 06:36:14 -0400 | [diff] [blame] | 1512 | opt.err_fd = err_fd; |
Jeff King | 6b4cd2f | 2016-07-15 06:36:35 -0400 | [diff] [blame] | 1513 | opt.progress = err_fd && !quiet; |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1514 | opt.env = tmp_objdir_env(tmp_objdir); |
Jeff King | d415092 | 2016-07-15 06:36:14 -0400 | [diff] [blame] | 1515 | if (check_connected(iterate_receive_command_list, &data, &opt)) |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1516 | set_connectivity_errors(commands, si); |
Junio C Hamano | 52fed6e | 2011-09-02 16:52:08 -0700 | [diff] [blame] | 1517 | |
Jeff King | d415092 | 2016-07-15 06:36:14 -0400 | [diff] [blame] | 1518 | if (use_sideband) |
| 1519 | finish_async(&muxer); |
| 1520 | |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1521 | reject_updates_to_hidden(commands); |
| 1522 | |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 1523 | if (run_receive_hook(commands, "pre-receive", 0, push_options)) { |
Clemens Buchacher | ef7e93d | 2012-02-13 21:17:12 +0100 | [diff] [blame] | 1524 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1525 | if (!cmd->error_string) |
| 1526 | cmd->error_string = "pre-receive hook declined"; |
| 1527 | } |
Shawn O. Pearce | 05ef58e | 2007-03-07 16:52:05 -0500 | [diff] [blame] | 1528 | return; |
| 1529 | } |
| 1530 | |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1531 | /* |
| 1532 | * Now we'll start writing out refs, which means the objects need |
| 1533 | * to be in their final positions so that other processes can see them. |
| 1534 | */ |
| 1535 | if (tmp_objdir_migrate(tmp_objdir) < 0) { |
| 1536 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1537 | if (!cmd->error_string) |
| 1538 | cmd->error_string = "unable to migrate objects to permanent storage"; |
| 1539 | } |
| 1540 | return; |
| 1541 | } |
| 1542 | tmp_objdir = NULL; |
| 1543 | |
Jay Soffian | da3efdb | 2010-04-19 18:19:18 -0400 | [diff] [blame] | 1544 | check_aliased_updates(commands); |
| 1545 | |
Nguyễn Thái Ngọc Duy | 96ec7b1 | 2011-12-13 21:17:48 +0700 | [diff] [blame] | 1546 | free(head_name_to_free); |
René Scharfe | efbd4fd | 2017-10-01 09:29:03 +0200 | [diff] [blame] | 1547 | head_name = head_name_to_free = resolve_refdup("HEAD", 0, NULL, NULL); |
Junio C Hamano | 747ca24 | 2009-02-08 22:31:21 -0800 | [diff] [blame] | 1548 | |
Stefan Beller | 68deed2 | 2015-01-07 19:23:19 -0800 | [diff] [blame] | 1549 | if (use_atomic) |
| 1550 | execute_commands_atomic(commands, si); |
| 1551 | else |
| 1552 | execute_commands_non_atomic(commands, si); |
Clemens Buchacher | ef7e93d | 2012-02-13 21:17:12 +0100 | [diff] [blame] | 1553 | |
Stefan Beller | a6a8431 | 2015-01-07 19:23:15 -0800 | [diff] [blame] | 1554 | if (shallow_update) |
| 1555 | warn_if_skipped_connectivity_check(commands, si); |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1556 | } |
| 1557 | |
Junio C Hamano | 39895c7 | 2014-08-15 14:28:28 -0700 | [diff] [blame] | 1558 | static struct command **queue_command(struct command **tail, |
| 1559 | const char *line, |
| 1560 | int linelen) |
| 1561 | { |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1562 | struct object_id old_oid, new_oid; |
Junio C Hamano | 39895c7 | 2014-08-15 14:28:28 -0700 | [diff] [blame] | 1563 | struct command *cmd; |
| 1564 | const char *refname; |
| 1565 | int reflen; |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1566 | const char *p; |
Junio C Hamano | 39895c7 | 2014-08-15 14:28:28 -0700 | [diff] [blame] | 1567 | |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1568 | if (parse_oid_hex(line, &old_oid, &p) || |
| 1569 | *p++ != ' ' || |
| 1570 | parse_oid_hex(p, &new_oid, &p) || |
| 1571 | *p++ != ' ') |
Junio C Hamano | 39895c7 | 2014-08-15 14:28:28 -0700 | [diff] [blame] | 1572 | die("protocol error: expected old/new/ref, got '%s'", line); |
| 1573 | |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1574 | refname = p; |
| 1575 | reflen = linelen - (p - line); |
René Scharfe | ddd0bfa | 2016-08-13 17:38:56 +0200 | [diff] [blame] | 1576 | FLEX_ALLOC_MEM(cmd, ref_name, refname, reflen); |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1577 | oidcpy(&cmd->old_oid, &old_oid); |
| 1578 | oidcpy(&cmd->new_oid, &new_oid); |
Junio C Hamano | 39895c7 | 2014-08-15 14:28:28 -0700 | [diff] [blame] | 1579 | *tail = cmd; |
| 1580 | return &cmd->next; |
| 1581 | } |
| 1582 | |
Junio C Hamano | 4adf569 | 2014-08-18 14:38:45 -0700 | [diff] [blame] | 1583 | static void queue_commands_from_cert(struct command **tail, |
| 1584 | struct strbuf *push_cert) |
| 1585 | { |
| 1586 | const char *boc, *eoc; |
| 1587 | |
| 1588 | if (*tail) |
| 1589 | die("protocol error: got both push certificate and unsigned commands"); |
| 1590 | |
| 1591 | boc = strstr(push_cert->buf, "\n\n"); |
| 1592 | if (!boc) |
| 1593 | die("malformed push certificate %.*s", 100, push_cert->buf); |
| 1594 | else |
| 1595 | boc += 2; |
| 1596 | eoc = push_cert->buf + parse_signature(push_cert->buf, push_cert->len); |
| 1597 | |
| 1598 | while (boc < eoc) { |
| 1599 | const char *eol = memchr(boc, '\n', eoc - boc); |
brian m. carlson | f2214de | 2017-03-26 16:01:28 +0000 | [diff] [blame] | 1600 | tail = queue_command(tail, boc, eol ? eol - boc : eoc - boc); |
Junio C Hamano | 4adf569 | 2014-08-18 14:38:45 -0700 | [diff] [blame] | 1601 | boc = eol ? eol + 1 : eoc; |
| 1602 | } |
| 1603 | } |
| 1604 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1605 | static struct command *read_head_info(struct packet_reader *reader, |
| 1606 | struct oid_array *shallow) |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1607 | { |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1608 | struct command *commands = NULL; |
Linus Torvalds | eb1af2d | 2005-06-29 23:01:14 -0700 | [diff] [blame] | 1609 | struct command **p = &commands; |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1610 | for (;;) { |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1611 | int linelen; |
Linus Torvalds | eb1af2d | 2005-06-29 23:01:14 -0700 | [diff] [blame] | 1612 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1613 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1614 | break; |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1615 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1616 | if (reader->pktlen > 8 && starts_with(reader->line, "shallow ")) { |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1617 | struct object_id oid; |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1618 | if (get_oid_hex(reader->line + 8, &oid)) |
Junio C Hamano | c09b71c | 2014-08-15 14:26:17 -0700 | [diff] [blame] | 1619 | die("protocol error: expected shallow sha, got '%s'", |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1620 | reader->line + 8); |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1621 | oid_array_append(shallow, &oid); |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1622 | continue; |
| 1623 | } |
| 1624 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1625 | linelen = strlen(reader->line); |
| 1626 | if (linelen < reader->pktlen) { |
| 1627 | const char *feature_list = reader->line + linelen + 1; |
brian m. carlson | bb095d0 | 2020-05-25 19:59:01 +0000 | [diff] [blame] | 1628 | const char *hash = NULL; |
| 1629 | int len = 0; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1630 | if (parse_feature_request(feature_list, "report-status")) |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1631 | report_status = 1; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1632 | if (parse_feature_request(feature_list, "side-band-64k")) |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 1633 | use_sideband = LARGE_PACKET_MAX; |
Clemens Buchacher | c207e34 | 2012-01-08 22:06:20 +0100 | [diff] [blame] | 1634 | if (parse_feature_request(feature_list, "quiet")) |
| 1635 | quiet = 1; |
Ronnie Sahlberg | 1b70fe5 | 2015-01-07 19:23:20 -0800 | [diff] [blame] | 1636 | if (advertise_atomic_push |
| 1637 | && parse_feature_request(feature_list, "atomic")) |
| 1638 | use_atomic = 1; |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 1639 | if (advertise_push_options |
| 1640 | && parse_feature_request(feature_list, "push-options")) |
| 1641 | use_push_options = 1; |
brian m. carlson | bb095d0 | 2020-05-25 19:59:01 +0000 | [diff] [blame] | 1642 | hash = parse_feature_value(feature_list, "object-format", &len, NULL); |
| 1643 | if (!hash) { |
| 1644 | hash = hash_algos[GIT_HASH_SHA1].name; |
| 1645 | len = strlen(hash); |
| 1646 | } |
| 1647 | if (xstrncmpz(the_hash_algo->name, hash, len)) |
| 1648 | die("error: unsupported object format '%s'", hash); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1649 | } |
Junio C Hamano | 0e3c339 | 2014-08-15 14:11:33 -0700 | [diff] [blame] | 1650 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1651 | if (!strcmp(reader->line, "push-cert")) { |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 1652 | int true_flush = 0; |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1653 | int saved_options = reader->options; |
| 1654 | reader->options &= ~PACKET_READ_CHOMP_NEWLINE; |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 1655 | |
| 1656 | for (;;) { |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1657 | packet_reader_read(reader); |
| 1658 | if (reader->status == PACKET_READ_FLUSH) { |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 1659 | true_flush = 1; |
| 1660 | break; |
| 1661 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1662 | if (reader->status != PACKET_READ_NORMAL) { |
| 1663 | die("protocol error: got an unexpected packet"); |
| 1664 | } |
| 1665 | if (!strcmp(reader->line, "push-cert-end\n")) |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 1666 | break; /* end of cert */ |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1667 | strbuf_addstr(&push_cert, reader->line); |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 1668 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1669 | reader->options = saved_options; |
Junio C Hamano | a85b377 | 2014-09-12 11:17:07 -0700 | [diff] [blame] | 1670 | |
| 1671 | if (true_flush) |
| 1672 | break; |
| 1673 | continue; |
| 1674 | } |
| 1675 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1676 | p = queue_command(p, reader->line, linelen); |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1677 | } |
Junio C Hamano | 4adf569 | 2014-08-18 14:38:45 -0700 | [diff] [blame] | 1678 | |
| 1679 | if (push_cert.len) |
| 1680 | queue_commands_from_cert(p, &push_cert); |
| 1681 | |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1682 | return commands; |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1683 | } |
| 1684 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1685 | static void read_push_options(struct packet_reader *reader, |
| 1686 | struct string_list *options) |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 1687 | { |
| 1688 | while (1) { |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1689 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 1690 | break; |
| 1691 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1692 | string_list_append(options, reader->line); |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 1693 | } |
| 1694 | } |
| 1695 | |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1696 | static const char *parse_pack_header(struct pack_header *hdr) |
| 1697 | { |
Junio C Hamano | a69e542 | 2007-01-22 21:55:18 -0800 | [diff] [blame] | 1698 | switch (read_pack_header(0, hdr)) { |
| 1699 | case PH_ERROR_EOF: |
| 1700 | return "eof before pack header was fully read"; |
| 1701 | |
| 1702 | case PH_ERROR_PACK_SIGNATURE: |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1703 | return "protocol error (pack signature mismatch detected)"; |
Junio C Hamano | a69e542 | 2007-01-22 21:55:18 -0800 | [diff] [blame] | 1704 | |
| 1705 | case PH_ERROR_PROTOCOL: |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1706 | return "protocol error (pack version unsupported)"; |
Junio C Hamano | a69e542 | 2007-01-22 21:55:18 -0800 | [diff] [blame] | 1707 | |
| 1708 | default: |
| 1709 | return "unknown error in parse_pack_header"; |
| 1710 | |
| 1711 | case 0: |
| 1712 | return NULL; |
| 1713 | } |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1714 | } |
| 1715 | |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 1716 | static const char *pack_lockfile; |
| 1717 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1718 | static void push_header_arg(struct strvec *args, struct pack_header *hdr) |
Jeff King | 446d5d9 | 2017-03-28 15:46:47 -0400 | [diff] [blame] | 1719 | { |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1720 | strvec_pushf(args, "--pack_header=%"PRIu32",%"PRIu32, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 1721 | ntohl(hdr->hdr_version), ntohl(hdr->hdr_entries)); |
Jeff King | 446d5d9 | 2017-03-28 15:46:47 -0400 | [diff] [blame] | 1722 | } |
| 1723 | |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1724 | static const char *unpack(int err_fd, struct shallow_info *si) |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1725 | { |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1726 | struct pack_header hdr; |
| 1727 | const char *hdr_err; |
Nguyễn Thái Ngọc Duy | 31c42bf | 2013-12-05 20:02:43 +0700 | [diff] [blame] | 1728 | int status; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 1729 | struct child_process child = CHILD_PROCESS_INIT; |
Junio C Hamano | dab76d3 | 2011-09-04 12:37:45 -0700 | [diff] [blame] | 1730 | int fsck_objects = (receive_fsck_objects >= 0 |
| 1731 | ? receive_fsck_objects |
| 1732 | : transfer_fsck_objects >= 0 |
| 1733 | ? transfer_fsck_objects |
| 1734 | : 0); |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1735 | |
| 1736 | hdr_err = parse_pack_header(&hdr); |
Jeff King | 49ecfa1 | 2013-04-19 17:24:29 -0400 | [diff] [blame] | 1737 | if (hdr_err) { |
| 1738 | if (err_fd > 0) |
| 1739 | close(err_fd); |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1740 | return hdr_err; |
Jeff King | 49ecfa1 | 2013-04-19 17:24:29 -0400 | [diff] [blame] | 1741 | } |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1742 | |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1743 | if (si->nr_ours || si->nr_theirs) { |
| 1744 | alt_shallow_file = setup_temporary_shallow(si->shallow); |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1745 | strvec_push(&child.args, "--shallow-file"); |
| 1746 | strvec_push(&child.args, alt_shallow_file); |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1747 | } |
| 1748 | |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1749 | tmp_objdir = tmp_objdir_create(); |
Jeff King | 6cdad1f | 2017-03-07 08:35:34 -0500 | [diff] [blame] | 1750 | if (!tmp_objdir) { |
| 1751 | if (err_fd > 0) |
| 1752 | close(err_fd); |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1753 | return "unable to create temporary object directory"; |
Jeff King | 6cdad1f | 2017-03-07 08:35:34 -0500 | [diff] [blame] | 1754 | } |
Jeff King | 722ff7f | 2016-10-03 16:49:14 -0400 | [diff] [blame] | 1755 | child.env = tmp_objdir_env(tmp_objdir); |
| 1756 | |
| 1757 | /* |
| 1758 | * Normally we just pass the tmp_objdir environment to the child |
| 1759 | * processes that do the heavy lifting, but we may need to see these |
| 1760 | * objects ourselves to set up shallow information. |
| 1761 | */ |
| 1762 | tmp_objdir_add_as_alternate(tmp_objdir); |
| 1763 | |
Shawn Pearce | fc04c41 | 2006-11-01 17:06:21 -0500 | [diff] [blame] | 1764 | if (ntohl(hdr.hdr_entries) < unpack_limit) { |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1765 | strvec_push(&child.args, "unpack-objects"); |
Jeff King | 446d5d9 | 2017-03-28 15:46:47 -0400 | [diff] [blame] | 1766 | push_header_arg(&child.args, &hdr); |
Clemens Buchacher | c207e34 | 2012-01-08 22:06:20 +0100 | [diff] [blame] | 1767 | if (quiet) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1768 | strvec_push(&child.args, "-q"); |
Junio C Hamano | dab76d3 | 2011-09-04 12:37:45 -0700 | [diff] [blame] | 1769 | if (fsck_objects) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1770 | strvec_pushf(&child.args, "--strict%s", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 1771 | fsck_msg_types.buf); |
Jeff King | c08db5a | 2016-08-24 20:41:57 +0200 | [diff] [blame] | 1772 | if (max_input_size) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1773 | strvec_pushf(&child.args, "--max-input-size=%"PRIuMAX, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 1774 | (uintmax_t)max_input_size); |
Jeff King | 59bfdfb | 2012-09-21 01:32:52 -0400 | [diff] [blame] | 1775 | child.no_stdout = 1; |
Jeff King | a22e6f8 | 2012-09-21 01:34:55 -0400 | [diff] [blame] | 1776 | child.err = err_fd; |
Jeff King | 59bfdfb | 2012-09-21 01:32:52 -0400 | [diff] [blame] | 1777 | child.git_cmd = 1; |
Nguyễn Thái Ngọc Duy | 31c42bf | 2013-12-05 20:02:43 +0700 | [diff] [blame] | 1778 | status = run_command(&child); |
| 1779 | if (status) |
| 1780 | return "unpack-objects abnormal exit"; |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 1781 | } else { |
René Scharfe | da25bdb | 2017-04-18 17:57:42 -0400 | [diff] [blame] | 1782 | char hostname[HOST_NAME_MAX + 1]; |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 1783 | |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1784 | strvec_pushl(&child.args, "index-pack", "--stdin", NULL); |
Jeff King | 446d5d9 | 2017-03-28 15:46:47 -0400 | [diff] [blame] | 1785 | push_header_arg(&child.args, &hdr); |
Jeff King | b26cb7c | 2015-09-24 17:08:14 -0400 | [diff] [blame] | 1786 | |
David Turner | 5781a9a | 2017-04-18 17:57:43 -0400 | [diff] [blame] | 1787 | if (xgethostname(hostname, sizeof(hostname))) |
Jeff King | b26cb7c | 2015-09-24 17:08:14 -0400 | [diff] [blame] | 1788 | xsnprintf(hostname, sizeof(hostname), "localhost"); |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1789 | strvec_pushf(&child.args, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 1790 | "--keep=receive-pack %"PRIuMAX" on %s", |
| 1791 | (uintmax_t)getpid(), |
| 1792 | hostname); |
Jeff King | b26cb7c | 2015-09-24 17:08:14 -0400 | [diff] [blame] | 1793 | |
Jeff King | d06303b | 2016-07-15 06:35:28 -0400 | [diff] [blame] | 1794 | if (!quiet && err_fd) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1795 | strvec_push(&child.args, "--show-resolving-progress"); |
Jeff King | 8355868 | 2016-07-15 06:43:47 -0400 | [diff] [blame] | 1796 | if (use_sideband) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1797 | strvec_push(&child.args, "--report-end-of-input"); |
Junio C Hamano | dab76d3 | 2011-09-04 12:37:45 -0700 | [diff] [blame] | 1798 | if (fsck_objects) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1799 | strvec_pushf(&child.args, "--strict%s", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 1800 | fsck_msg_types.buf); |
Sidhant Sharma [:tk] | 1b68387 | 2016-03-02 01:51:01 +0530 | [diff] [blame] | 1801 | if (!reject_thin) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1802 | strvec_push(&child.args, "--fix-thin"); |
Jeff King | c08db5a | 2016-08-24 20:41:57 +0200 | [diff] [blame] | 1803 | if (max_input_size) |
Jeff King | 22f9b7f | 2020-07-28 16:24:27 -0400 | [diff] [blame] | 1804 | strvec_pushf(&child.args, "--max-input-size=%"PRIuMAX, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 1805 | (uintmax_t)max_input_size); |
Nguyễn Thái Ngọc Duy | 31c42bf | 2013-12-05 20:02:43 +0700 | [diff] [blame] | 1806 | child.out = -1; |
| 1807 | child.err = err_fd; |
| 1808 | child.git_cmd = 1; |
| 1809 | status = start_command(&child); |
| 1810 | if (status) |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 1811 | return "index-pack fork failed"; |
Nguyễn Thái Ngọc Duy | 31c42bf | 2013-12-05 20:02:43 +0700 | [diff] [blame] | 1812 | pack_lockfile = index_pack_lockfile(child.out); |
| 1813 | close(child.out); |
| 1814 | status = finish_command(&child); |
| 1815 | if (status) |
| 1816 | return "index-pack abnormal exit"; |
Stefan Beller | a49d283 | 2018-03-23 18:45:21 +0100 | [diff] [blame] | 1817 | reprepare_packed_git(the_repository); |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1818 | } |
Nguyễn Thái Ngọc Duy | 31c42bf | 2013-12-05 20:02:43 +0700 | [diff] [blame] | 1819 | return NULL; |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1820 | } |
| 1821 | |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1822 | static const char *unpack_with_sideband(struct shallow_info *si) |
Jeff King | a22e6f8 | 2012-09-21 01:34:55 -0400 | [diff] [blame] | 1823 | { |
| 1824 | struct async muxer; |
| 1825 | const char *ret; |
| 1826 | |
| 1827 | if (!use_sideband) |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1828 | return unpack(0, si); |
Jeff King | a22e6f8 | 2012-09-21 01:34:55 -0400 | [diff] [blame] | 1829 | |
Jeff King | 8355868 | 2016-07-15 06:43:47 -0400 | [diff] [blame] | 1830 | use_keepalive = KEEPALIVE_AFTER_NUL; |
Jeff King | a22e6f8 | 2012-09-21 01:34:55 -0400 | [diff] [blame] | 1831 | memset(&muxer, 0, sizeof(muxer)); |
| 1832 | muxer.proc = copy_to_sideband; |
| 1833 | muxer.in = -1; |
| 1834 | if (start_async(&muxer)) |
| 1835 | return NULL; |
| 1836 | |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1837 | ret = unpack(muxer.in, si); |
Jeff King | a22e6f8 | 2012-09-21 01:34:55 -0400 | [diff] [blame] | 1838 | |
| 1839 | finish_async(&muxer); |
| 1840 | return ret; |
| 1841 | } |
| 1842 | |
Jeff King | c95fc72 | 2019-05-09 17:31:39 -0400 | [diff] [blame] | 1843 | static void prepare_shallow_update(struct shallow_info *si) |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1844 | { |
René Scharfe | 42c78a2 | 2017-07-08 12:35:35 +0200 | [diff] [blame] | 1845 | int i, j, k, bitmap_size = DIV_ROUND_UP(si->ref->nr, 32); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1846 | |
Jeff King | b32fa95 | 2016-02-22 17:44:25 -0500 | [diff] [blame] | 1847 | ALLOC_ARRAY(si->used_shallow, si->shallow->nr); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1848 | assign_shallow_commits_to_refs(si, si->used_shallow, NULL); |
| 1849 | |
| 1850 | si->need_reachability_test = |
| 1851 | xcalloc(si->shallow->nr, sizeof(*si->need_reachability_test)); |
| 1852 | si->reachable = |
| 1853 | xcalloc(si->shallow->nr, sizeof(*si->reachable)); |
| 1854 | si->shallow_ref = xcalloc(si->ref->nr, sizeof(*si->shallow_ref)); |
| 1855 | |
| 1856 | for (i = 0; i < si->nr_ours; i++) |
| 1857 | si->need_reachability_test[si->ours[i]] = 1; |
| 1858 | |
| 1859 | for (i = 0; i < si->shallow->nr; i++) { |
| 1860 | if (!si->used_shallow[i]) |
| 1861 | continue; |
| 1862 | for (j = 0; j < bitmap_size; j++) { |
| 1863 | if (!si->used_shallow[i][j]) |
| 1864 | continue; |
| 1865 | si->need_reachability_test[i]++; |
| 1866 | for (k = 0; k < 32; k++) |
Jeff King | 9a93c66 | 2015-12-29 01:35:46 -0500 | [diff] [blame] | 1867 | if (si->used_shallow[i][j] & (1U << k)) |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1868 | si->shallow_ref[j * 32 + k]++; |
| 1869 | } |
| 1870 | |
| 1871 | /* |
| 1872 | * true for those associated with some refs and belong |
| 1873 | * in "ours" list aka "step 7 not done yet" |
| 1874 | */ |
| 1875 | si->need_reachability_test[i] = |
| 1876 | si->need_reachability_test[i] > 1; |
| 1877 | } |
| 1878 | |
| 1879 | /* |
| 1880 | * keep hooks happy by forcing a temporary shallow file via |
| 1881 | * env variable because we can't add --shallow-file to every |
Jeff King | 7987d22 | 2018-09-21 19:04:45 -0400 | [diff] [blame] | 1882 | * command. check_connected() will be done with |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1883 | * true .git/shallow though. |
| 1884 | */ |
| 1885 | setenv(GIT_SHALLOW_FILE_ENVIRONMENT, alt_shallow_file, 1); |
| 1886 | } |
| 1887 | |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1888 | static void update_shallow_info(struct command *commands, |
| 1889 | struct shallow_info *si, |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1890 | struct oid_array *ref) |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1891 | { |
| 1892 | struct command *cmd; |
| 1893 | int *ref_status; |
| 1894 | remove_nonexistent_theirs_shallow(si); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1895 | if (!si->nr_ours && !si->nr_theirs) { |
| 1896 | shallow_update = 0; |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1897 | return; |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1898 | } |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1899 | |
| 1900 | for (cmd = commands; cmd; cmd = cmd->next) { |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1901 | if (is_null_oid(&cmd->new_oid)) |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1902 | continue; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1903 | oid_array_append(ref, &cmd->new_oid); |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1904 | cmd->index = ref->nr - 1; |
| 1905 | } |
| 1906 | si->ref = ref; |
| 1907 | |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1908 | if (shallow_update) { |
Jeff King | c95fc72 | 2019-05-09 17:31:39 -0400 | [diff] [blame] | 1909 | prepare_shallow_update(si); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 1910 | return; |
| 1911 | } |
| 1912 | |
Jeff King | b32fa95 | 2016-02-22 17:44:25 -0500 | [diff] [blame] | 1913 | ALLOC_ARRAY(ref_status, ref->nr); |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1914 | assign_shallow_commits_to_refs(si, NULL, ref_status); |
| 1915 | for (cmd = commands; cmd; cmd = cmd->next) { |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1916 | if (is_null_oid(&cmd->new_oid)) |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1917 | continue; |
| 1918 | if (ref_status[cmd->index]) { |
| 1919 | cmd->error_string = "shallow update not allowed"; |
| 1920 | cmd->skip_update = 1; |
| 1921 | } |
| 1922 | } |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1923 | free(ref_status); |
| 1924 | } |
| 1925 | |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1926 | static void report(struct command *commands, const char *unpack_status) |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1927 | { |
| 1928 | struct command *cmd; |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 1929 | struct strbuf buf = STRBUF_INIT; |
| 1930 | |
| 1931 | packet_buf_write(&buf, "unpack %s\n", |
| 1932 | unpack_status ? unpack_status : "ok"); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1933 | for (cmd = commands; cmd; cmd = cmd->next) { |
| 1934 | if (!cmd->error_string) |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 1935 | packet_buf_write(&buf, "ok %s\n", |
| 1936 | cmd->ref_name); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1937 | else |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 1938 | packet_buf_write(&buf, "ng %s %s\n", |
| 1939 | cmd->ref_name, cmd->error_string); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1940 | } |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 1941 | packet_buf_flush(&buf); |
| 1942 | |
| 1943 | if (use_sideband) |
| 1944 | send_sideband(1, 1, buf.buf, buf.len, use_sideband); |
| 1945 | else |
Jeff King | cdf4fb8 | 2013-02-20 15:01:56 -0500 | [diff] [blame] | 1946 | write_or_die(1, buf.buf, buf.len); |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 1947 | strbuf_release(&buf); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 1948 | } |
| 1949 | |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1950 | static int delete_only(struct command *commands) |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 1951 | { |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1952 | struct command *cmd; |
| 1953 | for (cmd = commands; cmd; cmd = cmd->next) { |
brian m. carlson | 9c44ea4 | 2017-03-26 16:01:29 +0000 | [diff] [blame] | 1954 | if (!is_null_oid(&cmd->new_oid)) |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 1955 | return 0; |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 1956 | } |
| 1957 | return 1; |
| 1958 | } |
| 1959 | |
Junio C Hamano | be5908a | 2008-09-09 01:27:08 -0700 | [diff] [blame] | 1960 | int cmd_receive_pack(int argc, const char **argv, const char *prefix) |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1961 | { |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 1962 | int advertise_refs = 0; |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 1963 | struct command *commands; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1964 | struct oid_array shallow = OID_ARRAY_INIT; |
| 1965 | struct oid_array ref = OID_ARRAY_INIT; |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 1966 | struct shallow_info si; |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1967 | struct packet_reader reader; |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1968 | |
Sidhant Sharma [:tk] | 1b68387 | 2016-03-02 01:51:01 +0530 | [diff] [blame] | 1969 | struct option options[] = { |
| 1970 | OPT__QUIET(&quiet, N_("quiet")), |
| 1971 | OPT_HIDDEN_BOOL(0, "stateless-rpc", &stateless_rpc, NULL), |
| 1972 | OPT_HIDDEN_BOOL(0, "advertise-refs", &advertise_refs, NULL), |
| 1973 | OPT_HIDDEN_BOOL(0, "reject-thin-pack-for-testing", &reject_thin, NULL), |
| 1974 | OPT_END() |
| 1975 | }; |
| 1976 | |
Jeff King | bbc30f9 | 2011-02-24 09:30:19 -0500 | [diff] [blame] | 1977 | packet_trace_identity("receive-pack"); |
| 1978 | |
Sidhant Sharma [:tk] | 1b68387 | 2016-03-02 01:51:01 +0530 | [diff] [blame] | 1979 | argc = parse_options(argc, argv, prefix, options, receive_pack_usage, 0); |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1980 | |
Sidhant Sharma [:tk] | 1b68387 | 2016-03-02 01:51:01 +0530 | [diff] [blame] | 1981 | if (argc > 1) |
| 1982 | usage_msg_opt(_("Too many arguments."), receive_pack_usage, options); |
| 1983 | if (argc == 0) |
| 1984 | usage_msg_opt(_("You must specify a directory."), receive_pack_usage, options); |
Clemens Buchacher | c207e34 | 2012-01-08 22:06:20 +0100 | [diff] [blame] | 1985 | |
Sidhant Sharma [:tk] | 1b68387 | 2016-03-02 01:51:01 +0530 | [diff] [blame] | 1986 | service_dir = argv[0]; |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1987 | |
Johannes Sixt | e1464ca | 2008-07-21 21:19:52 +0200 | [diff] [blame] | 1988 | setup_path(); |
Björn Steinbrink | 5c09f32 | 2008-03-03 05:08:43 +0100 | [diff] [blame] | 1989 | |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 1990 | if (!enter_repo(service_dir, 0)) |
| 1991 | die("'%s' does not appear to be a git repository", service_dir); |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 1992 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 1993 | git_config(receive_pack_config, NULL); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 1994 | if (cert_nonce_seed) |
Junio C Hamano | 5732373 | 2014-09-05 10:46:04 -0700 | [diff] [blame] | 1995 | push_cert_nonce = prepare_push_cert_nonce(service_dir, time(NULL)); |
Shawn Pearce | 6fb75be | 2006-10-30 17:35:18 -0500 | [diff] [blame] | 1996 | |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 1997 | if (0 <= transfer_unpack_limit) |
| 1998 | unpack_limit = transfer_unpack_limit; |
| 1999 | else if (0 <= receive_unpack_limit) |
| 2000 | unpack_limit = receive_unpack_limit; |
| 2001 | |
Brandon Williams | aa9bab2 | 2017-10-16 10:55:26 -0700 | [diff] [blame] | 2002 | switch (determine_protocol_version_server()) { |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 2003 | case protocol_v2: |
| 2004 | /* |
| 2005 | * push support for protocol v2 has not been implemented yet, |
| 2006 | * so ignore the request to use v2 and fallback to using v0. |
| 2007 | */ |
| 2008 | break; |
Brandon Williams | aa9bab2 | 2017-10-16 10:55:26 -0700 | [diff] [blame] | 2009 | case protocol_v1: |
| 2010 | /* |
| 2011 | * v1 is just the original protocol with a version string, |
| 2012 | * so just fall through after writing the version string. |
| 2013 | */ |
| 2014 | if (advertise_refs || !stateless_rpc) |
| 2015 | packet_write_fmt(1, "version 1\n"); |
| 2016 | |
| 2017 | /* fallthrough */ |
| 2018 | case protocol_v0: |
| 2019 | break; |
| 2020 | case protocol_unknown_version: |
| 2021 | BUG("unknown protocol version"); |
| 2022 | } |
| 2023 | |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 2024 | if (advertise_refs || !stateless_rpc) { |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 2025 | write_head_info(); |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 2026 | } |
| 2027 | if (advertise_refs) |
| 2028 | return 0; |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 2029 | |
Masaya Suzuki | 2d103c3 | 2018-12-29 13:19:15 -0800 | [diff] [blame] | 2030 | packet_reader_init(&reader, 0, NULL, 0, |
| 2031 | PACKET_READ_CHOMP_NEWLINE | |
| 2032 | PACKET_READ_DIE_ON_ERR_PACKET); |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 2033 | |
| 2034 | if ((commands = read_head_info(&reader, &shallow)) != NULL) { |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 2035 | const char *unpack_status = NULL; |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 2036 | struct string_list push_options = STRING_LIST_INIT_DUP; |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 2037 | |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 2038 | if (use_push_options) |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 2039 | read_push_options(&reader, &push_options); |
Jonathan Tan | cbaf82c | 2017-05-09 12:23:53 -0700 | [diff] [blame] | 2040 | if (!check_cert_push_options(&push_options)) { |
| 2041 | struct command *cmd; |
| 2042 | for (cmd = commands; cmd; cmd = cmd->next) |
| 2043 | cmd->error_string = "inconsistent push options"; |
| 2044 | } |
Stefan Beller | c714e45 | 2016-07-14 14:49:46 -0700 | [diff] [blame] | 2045 | |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 2046 | prepare_shallow_info(&si, &shallow); |
Nguyễn Thái Ngọc Duy | 0a1bc12 | 2013-12-05 20:02:47 +0700 | [diff] [blame] | 2047 | if (!si.nr_ours && !si.nr_theirs) |
| 2048 | shallow_update = 0; |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 2049 | if (!delete_only(commands)) { |
| 2050 | unpack_status = unpack_with_sideband(&si); |
| 2051 | update_shallow_info(commands, &si, &ref); |
| 2052 | } |
Jeff King | 8355868 | 2016-07-15 06:43:47 -0400 | [diff] [blame] | 2053 | use_keepalive = KEEPALIVE_ALWAYS; |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 2054 | execute_commands(commands, unpack_status, &si, |
| 2055 | &push_options); |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 2056 | if (pack_lockfile) |
Alex Riesen | 691f1a2 | 2009-04-29 23:22:56 +0200 | [diff] [blame] | 2057 | unlink_or_warn(pack_lockfile); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 2058 | if (report_status) |
Jay Soffian | 5e1c71f | 2010-04-19 18:08:30 -0400 | [diff] [blame] | 2059 | report(commands, unpack_status); |
Stefan Beller | 77a9745 | 2016-07-14 14:49:45 -0700 | [diff] [blame] | 2060 | run_receive_hook(commands, "post-receive", 1, |
| 2061 | &push_options); |
Shawn O. Pearce | 8e663d9 | 2007-03-07 16:50:24 -0500 | [diff] [blame] | 2062 | run_update_post_hook(commands); |
René Scharfe | 4432dd6 | 2017-01-29 14:09:46 +0100 | [diff] [blame] | 2063 | string_list_clear(&push_options, 0); |
Junio C Hamano | 77e3efb | 2009-10-20 14:56:40 -0700 | [diff] [blame] | 2064 | if (auto_gc) { |
| 2065 | const char *argv_gc_auto[] = { |
| 2066 | "gc", "--auto", "--quiet", NULL, |
| 2067 | }; |
Lukas Fleischer | 860a2eb | 2016-06-05 11:36:38 +0200 | [diff] [blame] | 2068 | struct child_process proc = CHILD_PROCESS_INIT; |
| 2069 | |
| 2070 | proc.no_stdin = 1; |
| 2071 | proc.stdout_to_stderr = 1; |
| 2072 | proc.err = use_sideband ? -1 : 0; |
| 2073 | proc.git_cmd = 1; |
| 2074 | proc.argv = argv_gc_auto; |
| 2075 | |
Derrick Stolee | 2d511cf | 2019-05-17 11:41:49 -0700 | [diff] [blame] | 2076 | close_object_store(the_repository->objects); |
Lukas Fleischer | 860a2eb | 2016-06-05 11:36:38 +0200 | [diff] [blame] | 2077 | if (!start_command(&proc)) { |
| 2078 | if (use_sideband) |
| 2079 | copy_to_sideband(proc.err, -1, NULL); |
| 2080 | finish_command(&proc); |
| 2081 | } |
Junio C Hamano | 77e3efb | 2009-10-20 14:56:40 -0700 | [diff] [blame] | 2082 | } |
| 2083 | if (auto_update_server_info) |
| 2084 | update_server_info(0); |
Nguyễn Thái Ngọc Duy | 5dbd767 | 2013-12-05 20:02:44 +0700 | [diff] [blame] | 2085 | clear_shallow_info(&si); |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 2086 | } |
Shawn O. Pearce | 38a81b4 | 2010-02-05 12:57:41 -0800 | [diff] [blame] | 2087 | if (use_sideband) |
| 2088 | packet_flush(1); |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 2089 | oid_array_clear(&shallow); |
| 2090 | oid_array_clear(&ref); |
Junio C Hamano | b89363e | 2014-08-21 16:45:30 -0700 | [diff] [blame] | 2091 | free((void *)push_cert_nonce); |
Linus Torvalds | 575f497 | 2005-06-29 17:52:11 -0700 | [diff] [blame] | 2092 | return 0; |
| 2093 | } |