]>
Commit | Line | Data |
---|---|---|
1e1ea69f PT |
1 | /* |
2 | * Builtin "git pull" | |
3 | * | |
4 | * Based on git-pull.sh by Junio C Hamano | |
5 | * | |
6 | * Fetch one or more remote refs and merge it/them into the current HEAD. | |
7 | */ | |
f8adbec9 | 8 | #define USE_THE_INDEX_COMPATIBILITY_MACROS |
1e1ea69f | 9 | #include "cache.h" |
b2141fc1 | 10 | #include "config.h" |
1e1ea69f PT |
11 | #include "builtin.h" |
12 | #include "parse-options.h" | |
d807c4a0 | 13 | #include "exec-cmd.h" |
f2c5baa1 | 14 | #include "run-command.h" |
fe299ec5 | 15 | #include "oid-array.h" |
44c175c7 | 16 | #include "remote.h" |
4a4cf9e8 | 17 | #include "dir.h" |
88f8576e | 18 | #include "rebase.h" |
49ec402d | 19 | #include "refs.h" |
ec0cb496 | 20 | #include "refspec.h" |
8944969c | 21 | #include "revision.h" |
a6d7eb2c SB |
22 | #include "submodule.h" |
23 | #include "submodule-config.h" | |
db86e61c | 24 | #include "tempfile.h" |
8944969c | 25 | #include "lockfile.h" |
fd84986f | 26 | #include "wt-status.h" |
64043556 | 27 | #include "commit-reach.h" |
d540b70c | 28 | #include "sequencer.h" |
7e44ff7a | 29 | #include "packfile.h" |
1e1ea69f | 30 | |
1678b81e PT |
31 | /** |
32 | * Parses the value of --rebase. If value is a false value, returns | |
33 | * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is | |
52f1e821 JS |
34 | * "merges", returns REBASE_MERGES. If value is a invalid value, dies with |
35 | * a fatal error if fatal is true, otherwise returns REBASE_INVALID. | |
1678b81e PT |
36 | */ |
37 | static enum rebase_type parse_config_rebase(const char *key, const char *value, | |
38 | int fatal) | |
39 | { | |
88f8576e BW |
40 | enum rebase_type v = rebase_parse_value(value); |
41 | if (v != REBASE_INVALID) | |
42 | return v; | |
1678b81e PT |
43 | |
44 | if (fatal) | |
45 | die(_("Invalid value for %s: %s"), key, value); | |
46 | else | |
47 | error(_("Invalid value for %s: %s"), key, value); | |
48 | ||
49 | return REBASE_INVALID; | |
50 | } | |
51 | ||
52 | /** | |
53 | * Callback for --rebase, which parses arg with parse_config_rebase(). | |
54 | */ | |
55 | static int parse_opt_rebase(const struct option *opt, const char *arg, int unset) | |
56 | { | |
57 | enum rebase_type *value = opt->value; | |
58 | ||
59 | if (arg) | |
60 | *value = parse_config_rebase("--rebase", arg, 0); | |
61 | else | |
62 | *value = unset ? REBASE_FALSE : REBASE_TRUE; | |
63 | return *value == REBASE_INVALID ? -1 : 0; | |
64 | } | |
65 | ||
1e1ea69f | 66 | static const char * const pull_usage[] = { |
e7a7401f | 67 | N_("git pull [<options>] [<repository> [<refspec>...]]"), |
1e1ea69f PT |
68 | NULL |
69 | }; | |
70 | ||
2a747902 PT |
71 | /* Shared options */ |
72 | static int opt_verbosity; | |
73 | static char *opt_progress; | |
a6d7eb2c | 74 | static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; |
2a747902 | 75 | |
1678b81e | 76 | /* Options passed to git-merge or git-rebase */ |
81dbd768 | 77 | static enum rebase_type opt_rebase = -1; |
11b6d178 PT |
78 | static char *opt_diffstat; |
79 | static char *opt_log; | |
3a4d2c74 | 80 | static char *opt_signoff; |
11b6d178 PT |
81 | static char *opt_squash; |
82 | static char *opt_commit; | |
83 | static char *opt_edit; | |
d540b70c | 84 | static char *cleanup_arg; |
11b6d178 PT |
85 | static char *opt_ff; |
86 | static char *opt_verify_signatures; | |
47bfdfb3 | 87 | static char *opt_verify; |
f66398eb | 88 | static int opt_autostash = -1; |
c48d73bd | 89 | static int config_autostash; |
54887b46 | 90 | static int check_trust_level = 1; |
22f9b7f3 JK |
91 | static struct strvec opt_strategies = STRVEC_INIT; |
92 | static struct strvec opt_strategy_opts = STRVEC_INIT; | |
11b6d178 | 93 | static char *opt_gpg_sign; |
09c2cb87 | 94 | static int opt_allow_unrelated_histories; |
11b6d178 | 95 | |
a32975f5 PT |
96 | /* Options passed to git-fetch */ |
97 | static char *opt_all; | |
98 | static char *opt_append; | |
99 | static char *opt_upload_pack; | |
100 | static int opt_force; | |
101 | static char *opt_tags; | |
102 | static char *opt_prune; | |
62104ba1 | 103 | static char *max_children; |
a32975f5 PT |
104 | static int opt_dry_run; |
105 | static char *opt_keep; | |
106 | static char *opt_depth; | |
107 | static char *opt_unshallow; | |
108 | static char *opt_update_shallow; | |
109 | static char *opt_refmap; | |
ffb4568a WS |
110 | static char *opt_ipv4; |
111 | static char *opt_ipv6; | |
3883c551 | 112 | static int opt_show_forced_updates = -1; |
24bc1a12 | 113 | static char *set_upstream; |
22f9b7f3 | 114 | static struct strvec opt_fetch = STRVEC_INIT; |
a32975f5 | 115 | |
1e1ea69f | 116 | static struct option pull_options[] = { |
2a747902 PT |
117 | /* Shared options */ |
118 | OPT__VERBOSITY(&opt_verbosity), | |
119 | OPT_PASSTHRU(0, "progress", &opt_progress, NULL, | |
120 | N_("force progress reporting"), | |
121 | PARSE_OPT_NOARG), | |
203c8533 | 122 | OPT_CALLBACK_F(0, "recurse-submodules", |
a6d7eb2c SB |
123 | &recurse_submodules, N_("on-demand"), |
124 | N_("control for recursive fetching of submodules"), | |
203c8533 | 125 | PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), |
2a747902 | 126 | |
1678b81e | 127 | /* Options passed to git-merge or git-rebase */ |
11b6d178 | 128 | OPT_GROUP(N_("Options related to merging")), |
203c8533 | 129 | OPT_CALLBACK_F('r', "rebase", &opt_rebase, |
52f1e821 | 130 | "(false|true|merges|interactive)", |
a7d18a11 FC |
131 | N_("incorporate changes by rebasing rather than merging"), |
132 | PARSE_OPT_OPTARG, parse_opt_rebase), | |
11b6d178 PT |
133 | OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL, |
134 | N_("do not show a diffstat at the end of the merge"), | |
135 | PARSE_OPT_NOARG | PARSE_OPT_NONEG), | |
136 | OPT_PASSTHRU(0, "stat", &opt_diffstat, NULL, | |
137 | N_("show a diffstat at the end of the merge"), | |
138 | PARSE_OPT_NOARG), | |
139 | OPT_PASSTHRU(0, "summary", &opt_diffstat, NULL, | |
140 | N_("(synonym to --stat)"), | |
141 | PARSE_OPT_NOARG | PARSE_OPT_HIDDEN), | |
142 | OPT_PASSTHRU(0, "log", &opt_log, N_("n"), | |
143 | N_("add (at most <n>) entries from shortlog to merge commit message"), | |
144 | PARSE_OPT_OPTARG), | |
3a4d2c74 | 145 | OPT_PASSTHRU(0, "signoff", &opt_signoff, NULL, |
3abd4a67 | 146 | N_("add a Signed-off-by trailer"), |
3a4d2c74 | 147 | PARSE_OPT_OPTARG), |
11b6d178 PT |
148 | OPT_PASSTHRU(0, "squash", &opt_squash, NULL, |
149 | N_("create a single commit instead of doing a merge"), | |
150 | PARSE_OPT_NOARG), | |
151 | OPT_PASSTHRU(0, "commit", &opt_commit, NULL, | |
152 | N_("perform a commit if the merge succeeds (default)"), | |
153 | PARSE_OPT_NOARG), | |
154 | OPT_PASSTHRU(0, "edit", &opt_edit, NULL, | |
155 | N_("edit message before committing"), | |
156 | PARSE_OPT_NOARG), | |
d540b70c | 157 | OPT_CLEANUP(&cleanup_arg), |
11b6d178 PT |
158 | OPT_PASSTHRU(0, "ff", &opt_ff, NULL, |
159 | N_("allow fast-forward"), | |
160 | PARSE_OPT_NOARG), | |
161 | OPT_PASSTHRU(0, "ff-only", &opt_ff, NULL, | |
162 | N_("abort if fast-forward is not possible"), | |
163 | PARSE_OPT_NOARG | PARSE_OPT_NONEG), | |
47bfdfb3 AR |
164 | OPT_PASSTHRU(0, "verify", &opt_verify, NULL, |
165 | N_("control use of pre-merge-commit and commit-msg hooks"), | |
166 | PARSE_OPT_NOARG), | |
11b6d178 PT |
167 | OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL, |
168 | N_("verify that the named commit has a valid GPG signature"), | |
169 | PARSE_OPT_NOARG), | |
f66398eb | 170 | OPT_BOOL(0, "autostash", &opt_autostash, |
d9f15d37 | 171 | N_("automatically stash/stash pop before and after")), |
11b6d178 PT |
172 | OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"), |
173 | N_("merge strategy to use"), | |
174 | 0), | |
175 | OPT_PASSTHRU_ARGV('X', "strategy-option", &opt_strategy_opts, | |
176 | N_("option=value"), | |
177 | N_("option for selected merge strategy"), | |
178 | 0), | |
179 | OPT_PASSTHRU('S', "gpg-sign", &opt_gpg_sign, N_("key-id"), | |
180 | N_("GPG sign commit"), | |
181 | PARSE_OPT_OPTARG), | |
09c2cb87 JH |
182 | OPT_SET_INT(0, "allow-unrelated-histories", |
183 | &opt_allow_unrelated_histories, | |
184 | N_("allow merging unrelated histories"), 1), | |
11b6d178 | 185 | |
a32975f5 PT |
186 | /* Options passed to git-fetch */ |
187 | OPT_GROUP(N_("Options related to fetching")), | |
188 | OPT_PASSTHRU(0, "all", &opt_all, NULL, | |
189 | N_("fetch from all remotes"), | |
190 | PARSE_OPT_NOARG), | |
191 | OPT_PASSTHRU('a', "append", &opt_append, NULL, | |
192 | N_("append to .git/FETCH_HEAD instead of overwriting"), | |
193 | PARSE_OPT_NOARG), | |
194 | OPT_PASSTHRU(0, "upload-pack", &opt_upload_pack, N_("path"), | |
195 | N_("path to upload pack on remote end"), | |
196 | 0), | |
1224781d | 197 | OPT__FORCE(&opt_force, N_("force overwrite of local branch"), 0), |
a32975f5 PT |
198 | OPT_PASSTHRU('t', "tags", &opt_tags, NULL, |
199 | N_("fetch all tags and associated objects"), | |
200 | PARSE_OPT_NOARG), | |
201 | OPT_PASSTHRU('p', "prune", &opt_prune, NULL, | |
202 | N_("prune remote-tracking branches no longer on remote"), | |
203 | PARSE_OPT_NOARG), | |
62104ba1 SB |
204 | OPT_PASSTHRU('j', "jobs", &max_children, N_("n"), |
205 | N_("number of submodules pulled in parallel"), | |
206 | PARSE_OPT_OPTARG), | |
a32975f5 PT |
207 | OPT_BOOL(0, "dry-run", &opt_dry_run, |
208 | N_("dry run")), | |
209 | OPT_PASSTHRU('k', "keep", &opt_keep, NULL, | |
210 | N_("keep downloaded pack"), | |
211 | PARSE_OPT_NOARG), | |
212 | OPT_PASSTHRU(0, "depth", &opt_depth, N_("depth"), | |
213 | N_("deepen history of shallow clone"), | |
214 | 0), | |
13ac5edb RS |
215 | OPT_PASSTHRU_ARGV(0, "shallow-since", &opt_fetch, N_("time"), |
216 | N_("deepen history of shallow repository based on time"), | |
217 | 0), | |
218 | OPT_PASSTHRU_ARGV(0, "shallow-exclude", &opt_fetch, N_("revision"), | |
219 | N_("deepen history of shallow clone, excluding rev"), | |
220 | 0), | |
221 | OPT_PASSTHRU_ARGV(0, "deepen", &opt_fetch, N_("n"), | |
222 | N_("deepen history of shallow clone"), | |
223 | 0), | |
a32975f5 PT |
224 | OPT_PASSTHRU(0, "unshallow", &opt_unshallow, NULL, |
225 | N_("convert to a complete repository"), | |
226 | PARSE_OPT_NONEG | PARSE_OPT_NOARG), | |
227 | OPT_PASSTHRU(0, "update-shallow", &opt_update_shallow, NULL, | |
228 | N_("accept refs that update .git/shallow"), | |
229 | PARSE_OPT_NOARG), | |
230 | OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"), | |
231 | N_("specify fetch refmap"), | |
232 | PARSE_OPT_NONEG), | |
13ac5edb RS |
233 | OPT_PASSTHRU_ARGV('o', "server-option", &opt_fetch, |
234 | N_("server-specific"), | |
235 | N_("option to transmit"), | |
236 | 0), | |
ffb4568a WS |
237 | OPT_PASSTHRU('4', "ipv4", &opt_ipv4, NULL, |
238 | N_("use IPv4 addresses only"), | |
239 | PARSE_OPT_NOARG), | |
240 | OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL, | |
241 | N_("use IPv6 addresses only"), | |
242 | PARSE_OPT_NOARG), | |
13ac5edb RS |
243 | OPT_PASSTHRU_ARGV(0, "negotiation-tip", &opt_fetch, N_("revision"), |
244 | N_("report that we have only objects reachable from this object"), | |
245 | 0), | |
3883c551 DS |
246 | OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates, |
247 | N_("check for forced-updates on all updated branches")), | |
24bc1a12 CB |
248 | OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL, |
249 | N_("set upstream for git pull/fetch"), | |
250 | PARSE_OPT_NOARG), | |
a32975f5 | 251 | |
1e1ea69f PT |
252 | OPT_END() |
253 | }; | |
254 | ||
2a747902 PT |
255 | /** |
256 | * Pushes "-q" or "-v" switches into arr to match the opt_verbosity level. | |
257 | */ | |
22f9b7f3 | 258 | static void argv_push_verbosity(struct strvec *arr) |
2a747902 PT |
259 | { |
260 | int verbosity; | |
261 | ||
262 | for (verbosity = opt_verbosity; verbosity > 0; verbosity--) | |
22f9b7f3 | 263 | strvec_push(arr, "-v"); |
2a747902 PT |
264 | |
265 | for (verbosity = opt_verbosity; verbosity < 0; verbosity++) | |
22f9b7f3 | 266 | strvec_push(arr, "-q"); |
2a747902 PT |
267 | } |
268 | ||
a32975f5 PT |
269 | /** |
270 | * Pushes "-f" switches into arr to match the opt_force level. | |
271 | */ | |
22f9b7f3 | 272 | static void argv_push_force(struct strvec *arr) |
a32975f5 PT |
273 | { |
274 | int force = opt_force; | |
275 | while (force-- > 0) | |
22f9b7f3 | 276 | strvec_push(arr, "-f"); |
a32975f5 PT |
277 | } |
278 | ||
41fca098 PT |
279 | /** |
280 | * Sets the GIT_REFLOG_ACTION environment variable to the concatenation of argv | |
281 | */ | |
282 | static void set_reflog_message(int argc, const char **argv) | |
283 | { | |
284 | int i; | |
285 | struct strbuf msg = STRBUF_INIT; | |
286 | ||
287 | for (i = 0; i < argc; i++) { | |
288 | if (i) | |
289 | strbuf_addch(&msg, ' '); | |
290 | strbuf_addstr(&msg, argv[i]); | |
291 | } | |
292 | ||
293 | setenv("GIT_REFLOG_ACTION", msg.buf, 0); | |
294 | ||
295 | strbuf_release(&msg); | |
296 | } | |
297 | ||
a9de9897 PT |
298 | /** |
299 | * If pull.ff is unset, returns NULL. If pull.ff is "true", returns "--ff". If | |
300 | * pull.ff is "false", returns "--no-ff". If pull.ff is "only", returns | |
301 | * "--ff-only". Otherwise, if pull.ff is set to an invalid value, die with an | |
302 | * error. | |
303 | */ | |
304 | static const char *config_get_ff(void) | |
305 | { | |
306 | const char *value; | |
307 | ||
308 | if (git_config_get_value("pull.ff", &value)) | |
309 | return NULL; | |
310 | ||
89576613 | 311 | switch (git_parse_maybe_bool(value)) { |
a9de9897 PT |
312 | case 0: |
313 | return "--no-ff"; | |
314 | case 1: | |
315 | return "--ff"; | |
316 | } | |
317 | ||
318 | if (!strcmp(value, "only")) | |
319 | return "--ff-only"; | |
320 | ||
321 | die(_("Invalid value for pull.ff: %s"), value); | |
322 | } | |
323 | ||
81dbd768 PT |
324 | /** |
325 | * Returns the default configured value for --rebase. It first looks for the | |
326 | * value of "branch.$curr_branch.rebase", where $curr_branch is the current | |
327 | * branch, and if HEAD is detached or the configuration key does not exist, | |
328 | * looks for the value of "pull.rebase". If both configuration keys do not | |
329 | * exist, returns REBASE_FALSE. | |
330 | */ | |
b044db91 | 331 | static enum rebase_type config_get_rebase(int *rebase_unspecified) |
81dbd768 PT |
332 | { |
333 | struct branch *curr_branch = branch_get("HEAD"); | |
334 | const char *value; | |
335 | ||
336 | if (curr_branch) { | |
337 | char *key = xstrfmt("branch.%s.rebase", curr_branch->name); | |
338 | ||
339 | if (!git_config_get_value(key, &value)) { | |
340 | enum rebase_type ret = parse_config_rebase(key, value, 1); | |
341 | free(key); | |
342 | return ret; | |
343 | } | |
344 | ||
345 | free(key); | |
346 | } | |
347 | ||
348 | if (!git_config_get_value("pull.rebase", &value)) | |
349 | return parse_config_rebase("pull.rebase", value, 1); | |
350 | ||
b044db91 | 351 | *rebase_unspecified = 1; |
d18c950a | 352 | |
81dbd768 PT |
353 | return REBASE_FALSE; |
354 | } | |
355 | ||
c48d73bd MJ |
356 | /** |
357 | * Read config variables. | |
358 | */ | |
359 | static int git_pull_config(const char *var, const char *value, void *cb) | |
360 | { | |
54887b46 HJI |
361 | int status; |
362 | ||
c48d73bd MJ |
363 | if (!strcmp(var, "rebase.autostash")) { |
364 | config_autostash = git_config_bool(var, value); | |
365 | return 0; | |
121e43fa NMC |
366 | } else if (!strcmp(var, "submodule.recurse")) { |
367 | recurse_submodules = git_config_bool(var, value) ? | |
368 | RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; | |
369 | return 0; | |
54887b46 HJI |
370 | } else if (!strcmp(var, "gpg.mintrustlevel")) { |
371 | check_trust_level = 0; | |
c48d73bd | 372 | } |
54887b46 HJI |
373 | |
374 | status = git_gpg_config(var, value, cb); | |
375 | if (status) | |
376 | return status; | |
377 | ||
c48d73bd MJ |
378 | return git_default_config(var, value, cb); |
379 | } | |
380 | ||
44c175c7 PT |
381 | /** |
382 | * Appends merge candidates from FETCH_HEAD that are not marked not-for-merge | |
383 | * into merge_heads. | |
384 | */ | |
910650d2 | 385 | static void get_merge_heads(struct oid_array *merge_heads) |
44c175c7 | 386 | { |
102de880 | 387 | const char *filename = git_path_fetch_head(the_repository); |
44c175c7 PT |
388 | FILE *fp; |
389 | struct strbuf sb = STRBUF_INIT; | |
14bb40b3 | 390 | struct object_id oid; |
44c175c7 | 391 | |
23a9e071 | 392 | fp = xfopen(filename, "r"); |
8f309aeb | 393 | while (strbuf_getline_lf(&sb, fp) != EOF) { |
fbfc089d | 394 | const char *p; |
395 | if (parse_oid_hex(sb.buf, &oid, &p)) | |
396 | continue; /* invalid line: does not start with object ID */ | |
397 | if (starts_with(p, "\tnot-for-merge\t")) | |
44c175c7 | 398 | continue; /* ref is not-for-merge */ |
910650d2 | 399 | oid_array_append(merge_heads, &oid); |
44c175c7 PT |
400 | } |
401 | fclose(fp); | |
402 | strbuf_release(&sb); | |
403 | } | |
404 | ||
405 | /** | |
406 | * Used by die_no_merge_candidates() as a for_each_remote() callback to | |
407 | * retrieve the name of the remote if the repository only has one remote. | |
408 | */ | |
409 | static int get_only_remote(struct remote *remote, void *cb_data) | |
410 | { | |
411 | const char **remote_name = cb_data; | |
412 | ||
413 | if (*remote_name) | |
414 | return -1; | |
415 | ||
416 | *remote_name = remote->name; | |
417 | return 0; | |
418 | } | |
419 | ||
420 | /** | |
421 | * Dies with the appropriate reason for why there are no merge candidates: | |
422 | * | |
423 | * 1. We fetched from a specific remote, and a refspec was given, but it ended | |
424 | * up not fetching anything. This is usually because the user provided a | |
425 | * wildcard refspec which had no matches on the remote end. | |
426 | * | |
427 | * 2. We fetched from a non-default remote, but didn't specify a branch to | |
428 | * merge. We can't use the configured one because it applies to the default | |
429 | * remote, thus the user must specify the branches to merge. | |
430 | * | |
431 | * 3. We fetched from the branch's or repo's default remote, but: | |
432 | * | |
433 | * a. We are not on a branch, so there will never be a configured branch to | |
434 | * merge with. | |
435 | * | |
436 | * b. We are on a branch, but there is no configured branch to merge with. | |
437 | * | |
438 | * 4. We fetched from the branch's or repo's default remote, but the configured | |
439 | * branch to merge didn't get fetched. (Either it doesn't exist, or wasn't | |
440 | * part of the configured fetch refspec.) | |
441 | */ | |
442 | static void NORETURN die_no_merge_candidates(const char *repo, const char **refspecs) | |
443 | { | |
444 | struct branch *curr_branch = branch_get("HEAD"); | |
445 | const char *remote = curr_branch ? curr_branch->remote_name : NULL; | |
446 | ||
447 | if (*refspecs) { | |
b7b31471 PT |
448 | if (opt_rebase) |
449 | fprintf_ln(stderr, _("There is no candidate for rebasing against among the refs that you just fetched.")); | |
450 | else | |
451 | fprintf_ln(stderr, _("There are no candidates for merging among the refs that you just fetched.")); | |
44c175c7 PT |
452 | fprintf_ln(stderr, _("Generally this means that you provided a wildcard refspec which had no\n" |
453 | "matches on the remote end.")); | |
454 | } else if (repo && curr_branch && (!remote || strcmp(repo, remote))) { | |
455 | fprintf_ln(stderr, _("You asked to pull from the remote '%s', but did not specify\n" | |
456 | "a branch. Because this is not the default configured remote\n" | |
457 | "for your current branch, you must specify a branch on the command line."), | |
458 | repo); | |
459 | } else if (!curr_branch) { | |
460 | fprintf_ln(stderr, _("You are not currently on a branch.")); | |
b7b31471 PT |
461 | if (opt_rebase) |
462 | fprintf_ln(stderr, _("Please specify which branch you want to rebase against.")); | |
463 | else | |
464 | fprintf_ln(stderr, _("Please specify which branch you want to merge with.")); | |
44c175c7 PT |
465 | fprintf_ln(stderr, _("See git-pull(1) for details.")); |
466 | fprintf(stderr, "\n"); | |
8a0de58a | 467 | fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>")); |
44c175c7 PT |
468 | fprintf(stderr, "\n"); |
469 | } else if (!curr_branch->merge_nr) { | |
470 | const char *remote_name = NULL; | |
471 | ||
472 | if (for_each_remote(get_only_remote, &remote_name) || !remote_name) | |
8a0de58a | 473 | remote_name = _("<remote>"); |
44c175c7 PT |
474 | |
475 | fprintf_ln(stderr, _("There is no tracking information for the current branch.")); | |
b7b31471 PT |
476 | if (opt_rebase) |
477 | fprintf_ln(stderr, _("Please specify which branch you want to rebase against.")); | |
478 | else | |
479 | fprintf_ln(stderr, _("Please specify which branch you want to merge with.")); | |
44c175c7 PT |
480 | fprintf_ln(stderr, _("See git-pull(1) for details.")); |
481 | fprintf(stderr, "\n"); | |
8a0de58a | 482 | fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>")); |
44c175c7 | 483 | fprintf(stderr, "\n"); |
daf9f649 VA |
484 | fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:")); |
485 | fprintf(stderr, "\n"); | |
486 | fprintf_ln(stderr, " git branch --set-upstream-to=%s/%s %s\n", | |
487 | remote_name, _("<branch>"), curr_branch->name); | |
44c175c7 PT |
488 | } else |
489 | fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n" | |
490 | "from the remote, but no such ref was fetched."), | |
491 | *curr_branch->merge_name); | |
492 | exit(1); | |
493 | } | |
494 | ||
f2c5baa1 PT |
495 | /** |
496 | * Parses argv into [<repo> [<refspecs>...]], returning their values in `repo` | |
497 | * as a string and `refspecs` as a null-terminated array of strings. If `repo` | |
498 | * is not provided in argv, it is set to NULL. | |
499 | */ | |
500 | static void parse_repo_refspecs(int argc, const char **argv, const char **repo, | |
501 | const char ***refspecs) | |
502 | { | |
503 | if (argc > 0) { | |
504 | *repo = *argv++; | |
505 | argc--; | |
506 | } else | |
507 | *repo = NULL; | |
508 | *refspecs = argv; | |
509 | } | |
510 | ||
511 | /** | |
512 | * Runs git-fetch, returning its exit status. `repo` and `refspecs` are the | |
513 | * repository and refspecs to fetch, or NULL if they are not provided. | |
514 | */ | |
515 | static int run_fetch(const char *repo, const char **refspecs) | |
516 | { | |
22f9b7f3 | 517 | struct strvec args = STRVEC_INIT; |
f2c5baa1 PT |
518 | int ret; |
519 | ||
22f9b7f3 | 520 | strvec_pushl(&args, "fetch", "--update-head-ok", NULL); |
2a747902 PT |
521 | |
522 | /* Shared options */ | |
523 | argv_push_verbosity(&args); | |
524 | if (opt_progress) | |
22f9b7f3 | 525 | strvec_push(&args, opt_progress); |
2a747902 | 526 | |
a32975f5 PT |
527 | /* Options passed to git-fetch */ |
528 | if (opt_all) | |
22f9b7f3 | 529 | strvec_push(&args, opt_all); |
a32975f5 | 530 | if (opt_append) |
22f9b7f3 | 531 | strvec_push(&args, opt_append); |
a32975f5 | 532 | if (opt_upload_pack) |
22f9b7f3 | 533 | strvec_push(&args, opt_upload_pack); |
a32975f5 PT |
534 | argv_push_force(&args); |
535 | if (opt_tags) | |
22f9b7f3 | 536 | strvec_push(&args, opt_tags); |
a32975f5 | 537 | if (opt_prune) |
22f9b7f3 | 538 | strvec_push(&args, opt_prune); |
a6d7eb2c SB |
539 | if (recurse_submodules != RECURSE_SUBMODULES_DEFAULT) |
540 | switch (recurse_submodules) { | |
541 | case RECURSE_SUBMODULES_ON: | |
22f9b7f3 | 542 | strvec_push(&args, "--recurse-submodules=on"); |
a6d7eb2c SB |
543 | break; |
544 | case RECURSE_SUBMODULES_OFF: | |
22f9b7f3 | 545 | strvec_push(&args, "--recurse-submodules=no"); |
a6d7eb2c SB |
546 | break; |
547 | case RECURSE_SUBMODULES_ON_DEMAND: | |
22f9b7f3 | 548 | strvec_push(&args, "--recurse-submodules=on-demand"); |
a6d7eb2c SB |
549 | break; |
550 | default: | |
551 | BUG("submodule recursion option not understood"); | |
552 | } | |
62104ba1 | 553 | if (max_children) |
22f9b7f3 | 554 | strvec_push(&args, max_children); |
a32975f5 | 555 | if (opt_dry_run) |
22f9b7f3 | 556 | strvec_push(&args, "--dry-run"); |
a32975f5 | 557 | if (opt_keep) |
22f9b7f3 | 558 | strvec_push(&args, opt_keep); |
a32975f5 | 559 | if (opt_depth) |
22f9b7f3 | 560 | strvec_push(&args, opt_depth); |
a32975f5 | 561 | if (opt_unshallow) |
22f9b7f3 | 562 | strvec_push(&args, opt_unshallow); |
a32975f5 | 563 | if (opt_update_shallow) |
22f9b7f3 | 564 | strvec_push(&args, opt_update_shallow); |
a32975f5 | 565 | if (opt_refmap) |
22f9b7f3 | 566 | strvec_push(&args, opt_refmap); |
ffb4568a | 567 | if (opt_ipv4) |
22f9b7f3 | 568 | strvec_push(&args, opt_ipv4); |
ffb4568a | 569 | if (opt_ipv6) |
22f9b7f3 | 570 | strvec_push(&args, opt_ipv6); |
3883c551 | 571 | if (opt_show_forced_updates > 0) |
22f9b7f3 | 572 | strvec_push(&args, "--show-forced-updates"); |
3883c551 | 573 | else if (opt_show_forced_updates == 0) |
22f9b7f3 | 574 | strvec_push(&args, "--no-show-forced-updates"); |
24bc1a12 | 575 | if (set_upstream) |
22f9b7f3 | 576 | strvec_push(&args, set_upstream); |
d70a9eb6 | 577 | strvec_pushv(&args, opt_fetch.v); |
a32975f5 | 578 | |
f2c5baa1 | 579 | if (repo) { |
22f9b7f3 JK |
580 | strvec_push(&args, repo); |
581 | strvec_pushv(&args, refspecs); | |
f2c5baa1 | 582 | } else if (*refspecs) |
033abf97 | 583 | BUG("refspecs without repo?"); |
c4dee2c0 | 584 | ret = run_command_v_opt(args.v, RUN_GIT_CMD | RUN_CLOSE_OBJECT_STORE); |
22f9b7f3 | 585 | strvec_clear(&args); |
f2c5baa1 PT |
586 | return ret; |
587 | } | |
588 | ||
49ec402d PT |
589 | /** |
590 | * "Pulls into void" by branching off merge_head. | |
591 | */ | |
ee3051bd | 592 | static int pull_into_void(const struct object_id *merge_head, |
f9b11147 | 593 | const struct object_id *curr_head) |
49ec402d | 594 | { |
01a31f3b JK |
595 | if (opt_verify_signatures) { |
596 | struct commit *commit; | |
597 | ||
598 | commit = lookup_commit(the_repository, merge_head); | |
599 | if (!commit) | |
600 | die(_("unable to access commit %s"), | |
601 | oid_to_hex(merge_head)); | |
602 | ||
54887b46 HJI |
603 | verify_merge_signature(commit, opt_verbosity, |
604 | check_trust_level); | |
01a31f3b JK |
605 | } |
606 | ||
49ec402d PT |
607 | /* |
608 | * Two-way merge: we treat the index as based on an empty tree, | |
609 | * and try to fast-forward to HEAD. This ensures we will not lose | |
610 | * index/worktree changes that the user already made on the unborn | |
611 | * branch. | |
612 | */ | |
7e196c3a NTND |
613 | if (checkout_fast_forward(the_repository, |
614 | the_hash_algo->empty_tree, | |
615 | merge_head, 0)) | |
49ec402d PT |
616 | return 1; |
617 | ||
ae077771 | 618 | if (update_ref("initial pull", "HEAD", merge_head, curr_head, 0, UPDATE_REFS_DIE_ON_ERR)) |
49ec402d PT |
619 | return 1; |
620 | ||
621 | return 0; | |
622 | } | |
623 | ||
a6d7eb2c SB |
624 | static int rebase_submodules(void) |
625 | { | |
626 | struct child_process cp = CHILD_PROCESS_INIT; | |
627 | ||
628 | cp.git_cmd = 1; | |
629 | cp.no_stdin = 1; | |
22f9b7f3 | 630 | strvec_pushl(&cp.args, "submodule", "update", |
f6d8942b | 631 | "--recursive", "--rebase", NULL); |
a56771a6 | 632 | argv_push_verbosity(&cp.args); |
a6d7eb2c SB |
633 | |
634 | return run_command(&cp); | |
635 | } | |
636 | ||
637 | static int update_submodules(void) | |
638 | { | |
639 | struct child_process cp = CHILD_PROCESS_INIT; | |
640 | ||
641 | cp.git_cmd = 1; | |
642 | cp.no_stdin = 1; | |
22f9b7f3 | 643 | strvec_pushl(&cp.args, "submodule", "update", |
f6d8942b | 644 | "--recursive", "--checkout", NULL); |
a56771a6 | 645 | argv_push_verbosity(&cp.args); |
a6d7eb2c SB |
646 | |
647 | return run_command(&cp); | |
648 | } | |
649 | ||
f2c5baa1 PT |
650 | /** |
651 | * Runs git-merge, returning its exit status. | |
652 | */ | |
653 | static int run_merge(void) | |
654 | { | |
655 | int ret; | |
22f9b7f3 | 656 | struct strvec args = STRVEC_INIT; |
f2c5baa1 | 657 | |
22f9b7f3 | 658 | strvec_pushl(&args, "merge", NULL); |
2a747902 PT |
659 | |
660 | /* Shared options */ | |
661 | argv_push_verbosity(&args); | |
662 | if (opt_progress) | |
22f9b7f3 | 663 | strvec_push(&args, opt_progress); |
2a747902 | 664 | |
11b6d178 PT |
665 | /* Options passed to git-merge */ |
666 | if (opt_diffstat) | |
22f9b7f3 | 667 | strvec_push(&args, opt_diffstat); |
11b6d178 | 668 | if (opt_log) |
22f9b7f3 | 669 | strvec_push(&args, opt_log); |
3a4d2c74 | 670 | if (opt_signoff) |
22f9b7f3 | 671 | strvec_push(&args, opt_signoff); |
11b6d178 | 672 | if (opt_squash) |
22f9b7f3 | 673 | strvec_push(&args, opt_squash); |
11b6d178 | 674 | if (opt_commit) |
22f9b7f3 | 675 | strvec_push(&args, opt_commit); |
11b6d178 | 676 | if (opt_edit) |
22f9b7f3 | 677 | strvec_push(&args, opt_edit); |
d540b70c | 678 | if (cleanup_arg) |
22f9b7f3 | 679 | strvec_pushf(&args, "--cleanup=%s", cleanup_arg); |
11b6d178 | 680 | if (opt_ff) |
22f9b7f3 | 681 | strvec_push(&args, opt_ff); |
47bfdfb3 AR |
682 | if (opt_verify) |
683 | strvec_push(&args, opt_verify); | |
11b6d178 | 684 | if (opt_verify_signatures) |
22f9b7f3 | 685 | strvec_push(&args, opt_verify_signatures); |
d70a9eb6 JK |
686 | strvec_pushv(&args, opt_strategies.v); |
687 | strvec_pushv(&args, opt_strategy_opts.v); | |
11b6d178 | 688 | if (opt_gpg_sign) |
22f9b7f3 | 689 | strvec_push(&args, opt_gpg_sign); |
d9f15d37 | 690 | if (opt_autostash == 0) |
22f9b7f3 | 691 | strvec_push(&args, "--no-autostash"); |
d9f15d37 | 692 | else if (opt_autostash == 1) |
22f9b7f3 | 693 | strvec_push(&args, "--autostash"); |
09c2cb87 | 694 | if (opt_allow_unrelated_histories > 0) |
22f9b7f3 | 695 | strvec_push(&args, "--allow-unrelated-histories"); |
11b6d178 | 696 | |
22f9b7f3 | 697 | strvec_push(&args, "FETCH_HEAD"); |
d70a9eb6 | 698 | ret = run_command_v_opt(args.v, RUN_GIT_CMD); |
22f9b7f3 | 699 | strvec_clear(&args); |
f2c5baa1 PT |
700 | return ret; |
701 | } | |
702 | ||
1678b81e PT |
703 | /** |
704 | * Returns remote's upstream branch for the current branch. If remote is NULL, | |
705 | * the current branch's configured default remote is used. Returns NULL if | |
706 | * `remote` does not name a valid remote, HEAD does not point to a branch, | |
707 | * remote is not the branch's configured remote or the branch does not have any | |
708 | * configured upstream branch. | |
709 | */ | |
710 | static const char *get_upstream_branch(const char *remote) | |
711 | { | |
712 | struct remote *rm; | |
713 | struct branch *curr_branch; | |
714 | const char *curr_branch_remote; | |
715 | ||
716 | rm = remote_get(remote); | |
717 | if (!rm) | |
718 | return NULL; | |
719 | ||
720 | curr_branch = branch_get("HEAD"); | |
721 | if (!curr_branch) | |
722 | return NULL; | |
723 | ||
724 | curr_branch_remote = remote_for_branch(curr_branch, NULL); | |
725 | assert(curr_branch_remote); | |
726 | ||
727 | if (strcmp(curr_branch_remote, rm->name)) | |
728 | return NULL; | |
729 | ||
730 | return branch_get_upstream(curr_branch, NULL); | |
731 | } | |
732 | ||
733 | /** | |
30aa96cd | 734 | * Derives the remote-tracking branch from the remote and refspec. |
1678b81e PT |
735 | * |
736 | * FIXME: The current implementation assumes the default mapping of | |
737 | * refs/heads/<branch_name> to refs/remotes/<remote_name>/<branch_name>. | |
738 | */ | |
739 | static const char *get_tracking_branch(const char *remote, const char *refspec) | |
740 | { | |
895d3912 | 741 | struct refspec_item spec; |
1678b81e PT |
742 | const char *spec_src; |
743 | const char *merge_branch; | |
744 | ||
dc064221 | 745 | refspec_item_init_or_die(&spec, refspec, REFSPEC_FETCH); |
895d3912 | 746 | spec_src = spec.src; |
1678b81e PT |
747 | if (!*spec_src || !strcmp(spec_src, "HEAD")) |
748 | spec_src = "HEAD"; | |
749 | else if (skip_prefix(spec_src, "heads/", &spec_src)) | |
750 | ; | |
751 | else if (skip_prefix(spec_src, "refs/heads/", &spec_src)) | |
752 | ; | |
753 | else if (starts_with(spec_src, "refs/") || | |
754 | starts_with(spec_src, "tags/") || | |
755 | starts_with(spec_src, "remotes/")) | |
756 | spec_src = ""; | |
757 | ||
758 | if (*spec_src) { | |
759 | if (!strcmp(remote, ".")) | |
760 | merge_branch = mkpath("refs/heads/%s", spec_src); | |
761 | else | |
762 | merge_branch = mkpath("refs/remotes/%s/%s", remote, spec_src); | |
763 | } else | |
764 | merge_branch = NULL; | |
765 | ||
895d3912 | 766 | refspec_item_clear(&spec); |
1678b81e PT |
767 | return merge_branch; |
768 | } | |
769 | ||
770 | /** | |
771 | * Given the repo and refspecs, sets fork_point to the point at which the | |
30aa96cd | 772 | * current branch forked from its remote-tracking branch. Returns 0 on success, |
1678b81e PT |
773 | * -1 on failure. |
774 | */ | |
f9b11147 | 775 | static int get_rebase_fork_point(struct object_id *fork_point, const char *repo, |
1678b81e PT |
776 | const char *refspec) |
777 | { | |
778 | int ret; | |
779 | struct branch *curr_branch; | |
780 | const char *remote_branch; | |
781 | struct child_process cp = CHILD_PROCESS_INIT; | |
782 | struct strbuf sb = STRBUF_INIT; | |
783 | ||
784 | curr_branch = branch_get("HEAD"); | |
785 | if (!curr_branch) | |
786 | return -1; | |
787 | ||
788 | if (refspec) | |
789 | remote_branch = get_tracking_branch(repo, refspec); | |
790 | else | |
791 | remote_branch = get_upstream_branch(repo); | |
792 | ||
793 | if (!remote_branch) | |
794 | return -1; | |
795 | ||
22f9b7f3 | 796 | strvec_pushl(&cp.args, "merge-base", "--fork-point", |
f6d8942b | 797 | remote_branch, curr_branch->name, NULL); |
1678b81e PT |
798 | cp.no_stdin = 1; |
799 | cp.no_stderr = 1; | |
800 | cp.git_cmd = 1; | |
801 | ||
fbfc089d | 802 | ret = capture_command(&cp, &sb, GIT_MAX_HEXSZ); |
1678b81e PT |
803 | if (ret) |
804 | goto cleanup; | |
805 | ||
f9b11147 | 806 | ret = get_oid_hex(sb.buf, fork_point); |
1678b81e PT |
807 | if (ret) |
808 | goto cleanup; | |
809 | ||
810 | cleanup: | |
811 | strbuf_release(&sb); | |
812 | return ret ? -1 : 0; | |
813 | } | |
814 | ||
815 | /** | |
816 | * Sets merge_base to the octopus merge base of curr_head, merge_head and | |
817 | * fork_point. Returns 0 if a merge base is found, 1 otherwise. | |
818 | */ | |
f9b11147 | 819 | static int get_octopus_merge_base(struct object_id *merge_base, |
820 | const struct object_id *curr_head, | |
ee3051bd | 821 | const struct object_id *merge_head, |
f9b11147 | 822 | const struct object_id *fork_point) |
1678b81e PT |
823 | { |
824 | struct commit_list *revs = NULL, *result; | |
825 | ||
2122f675 SB |
826 | commit_list_insert(lookup_commit_reference(the_repository, curr_head), |
827 | &revs); | |
828 | commit_list_insert(lookup_commit_reference(the_repository, merge_head), | |
829 | &revs); | |
f9b11147 | 830 | if (!is_null_oid(fork_point)) |
2122f675 SB |
831 | commit_list_insert(lookup_commit_reference(the_repository, fork_point), |
832 | &revs); | |
1678b81e | 833 | |
4da72644 | 834 | result = get_octopus_merge_bases(revs); |
1678b81e | 835 | free_commit_list(revs); |
4da72644 MÅ |
836 | reduce_heads_replace(&result); |
837 | ||
1678b81e PT |
838 | if (!result) |
839 | return 1; | |
840 | ||
f9b11147 | 841 | oidcpy(merge_base, &result->item->object.oid); |
4da72644 | 842 | free_commit_list(result); |
1678b81e PT |
843 | return 0; |
844 | } | |
845 | ||
846 | /** | |
fbfc089d | 847 | * Given the current HEAD oid, the merge head returned from git-fetch and the |
4f66d79a PB |
848 | * fork point calculated by get_rebase_fork_point(), compute the <newbase> and |
849 | * <upstream> arguments to use for the upcoming git-rebase invocation. | |
1678b81e | 850 | */ |
4f66d79a PB |
851 | static int get_rebase_newbase_and_upstream(struct object_id *newbase, |
852 | struct object_id *upstream, | |
853 | const struct object_id *curr_head, | |
ee3051bd | 854 | const struct object_id *merge_head, |
f9b11147 | 855 | const struct object_id *fork_point) |
1678b81e | 856 | { |
f9b11147 | 857 | struct object_id oct_merge_base; |
1678b81e | 858 | |
f9b11147 | 859 | if (!get_octopus_merge_base(&oct_merge_base, curr_head, merge_head, fork_point)) |
4a7e27e9 | 860 | if (!is_null_oid(fork_point) && oideq(&oct_merge_base, fork_point)) |
1678b81e PT |
861 | fork_point = NULL; |
862 | ||
4f66d79a PB |
863 | if (fork_point && !is_null_oid(fork_point)) |
864 | oidcpy(upstream, fork_point); | |
865 | else | |
866 | oidcpy(upstream, merge_head); | |
867 | ||
868 | oidcpy(newbase, merge_head); | |
869 | ||
870 | return 0; | |
871 | } | |
872 | ||
873 | /** | |
874 | * Given the <newbase> and <upstream> calculated by | |
875 | * get_rebase_newbase_and_upstream(), runs git-rebase with the | |
876 | * appropriate arguments and returns its exit status. | |
877 | */ | |
878 | static int run_rebase(const struct object_id *newbase, | |
879 | const struct object_id *upstream) | |
880 | { | |
881 | int ret; | |
882 | struct strvec args = STRVEC_INIT; | |
883 | ||
22f9b7f3 | 884 | strvec_push(&args, "rebase"); |
1678b81e PT |
885 | |
886 | /* Shared options */ | |
887 | argv_push_verbosity(&args); | |
888 | ||
889 | /* Options passed to git-rebase */ | |
1131ec98 | 890 | if (opt_rebase == REBASE_MERGES) |
22f9b7f3 | 891 | strvec_push(&args, "--rebase-merges"); |
f5eb87b9 | 892 | else if (opt_rebase == REBASE_INTERACTIVE) |
22f9b7f3 | 893 | strvec_push(&args, "--interactive"); |
1678b81e | 894 | if (opt_diffstat) |
22f9b7f3 | 895 | strvec_push(&args, opt_diffstat); |
d70a9eb6 JK |
896 | strvec_pushv(&args, opt_strategies.v); |
897 | strvec_pushv(&args, opt_strategy_opts.v); | |
1678b81e | 898 | if (opt_gpg_sign) |
22f9b7f3 | 899 | strvec_push(&args, opt_gpg_sign); |
359ff693 EN |
900 | if (opt_signoff) |
901 | strvec_push(&args, opt_signoff); | |
f66398eb | 902 | if (opt_autostash == 0) |
22f9b7f3 | 903 | strvec_push(&args, "--no-autostash"); |
f66398eb | 904 | else if (opt_autostash == 1) |
22f9b7f3 | 905 | strvec_push(&args, "--autostash"); |
c57e501c AH |
906 | if (opt_verify_signatures && |
907 | !strcmp(opt_verify_signatures, "--verify-signatures")) | |
908 | warning(_("ignoring --verify-signatures for rebase")); | |
1678b81e | 909 | |
22f9b7f3 | 910 | strvec_push(&args, "--onto"); |
4f66d79a | 911 | strvec_push(&args, oid_to_hex(newbase)); |
1678b81e | 912 | |
4f66d79a | 913 | strvec_push(&args, oid_to_hex(upstream)); |
1678b81e | 914 | |
d70a9eb6 | 915 | ret = run_command_v_opt(args.v, RUN_GIT_CMD); |
22f9b7f3 | 916 | strvec_clear(&args); |
1678b81e PT |
917 | return ret; |
918 | } | |
919 | ||
6f843a33 EN |
920 | static int get_can_ff(struct object_id *orig_head, |
921 | struct oid_array *merge_heads) | |
77a7ec63 FC |
922 | { |
923 | int ret; | |
924 | struct commit_list *list = NULL; | |
925 | struct commit *merge_head, *head; | |
6f843a33 | 926 | struct object_id *orig_merge_head; |
77a7ec63 | 927 | |
6f843a33 EN |
928 | if (merge_heads->nr > 1) |
929 | return 0; | |
930 | ||
931 | orig_merge_head = &merge_heads->oid[0]; | |
77a7ec63 FC |
932 | head = lookup_commit_reference(the_repository, orig_head); |
933 | commit_list_insert(head, &list); | |
934 | merge_head = lookup_commit_reference(the_repository, orig_merge_head); | |
935 | ret = repo_is_descendant_of(the_repository, merge_head, list); | |
936 | free_commit_list(list); | |
937 | return ret; | |
938 | } | |
939 | ||
361cb523 JH |
940 | /* |
941 | * Is orig_head a descendant of _all_ merge_heads? | |
942 | * Unfortunately is_descendant_of() cannot be used as it asks | |
943 | * if orig_head is a descendant of at least one of them. | |
944 | */ | |
945 | static int already_up_to_date(struct object_id *orig_head, | |
946 | struct oid_array *merge_heads) | |
947 | { | |
948 | int i; | |
949 | struct commit *ours; | |
950 | ||
951 | ours = lookup_commit_reference(the_repository, orig_head); | |
952 | for (i = 0; i < merge_heads->nr; i++) { | |
953 | struct commit_list *list = NULL; | |
954 | struct commit *theirs; | |
955 | int ok; | |
956 | ||
957 | theirs = lookup_commit_reference(the_repository, &merge_heads->oid[i]); | |
958 | commit_list_insert(theirs, &list); | |
959 | ok = repo_is_descendant_of(the_repository, ours, list); | |
960 | free_commit_list(list); | |
961 | if (!ok) | |
962 | return 0; | |
963 | } | |
964 | return 1; | |
965 | } | |
966 | ||
7539fdc6 JH |
967 | static void show_advice_pull_non_ff(void) |
968 | { | |
031e2f7a EN |
969 | advise(_("You have divergent branches and need to specify how to reconcile them.\n" |
970 | "You can do so by running one of the following commands sometime before\n" | |
971 | "your next pull:\n" | |
7539fdc6 | 972 | "\n" |
71076d0e | 973 | " git config pull.rebase false # merge\n" |
7539fdc6 JH |
974 | " git config pull.rebase true # rebase\n" |
975 | " git config pull.ff only # fast-forward only\n" | |
976 | "\n" | |
977 | "You can replace \"git config\" with \"git config --global\" to set a default\n" | |
978 | "preference for all repositories. You can also pass --rebase, --no-rebase,\n" | |
979 | "or --ff-only on the command line to override the configured default per\n" | |
980 | "invocation.\n")); | |
981 | } | |
982 | ||
1e1ea69f PT |
983 | int cmd_pull(int argc, const char **argv, const char *prefix) |
984 | { | |
f2c5baa1 | 985 | const char *repo, **refspecs; |
910650d2 | 986 | struct oid_array merge_heads = OID_ARRAY_INIT; |
f9b11147 | 987 | struct object_id orig_head, curr_head; |
988 | struct object_id rebase_fork_point; | |
b044db91 | 989 | int rebase_unspecified = 0; |
c525de33 | 990 | int can_ff; |
ea1954af | 991 | int divergent; |
f2c5baa1 | 992 | |
41fca098 PT |
993 | if (!getenv("GIT_REFLOG_ACTION")) |
994 | set_reflog_message(argc, argv); | |
995 | ||
cad0c692 | 996 | git_config(git_pull_config, NULL); |
5a4e0547 DS |
997 | prepare_repo_settings(the_repository); |
998 | the_repository->settings.command_requires_full_index = 0; | |
cad0c692 | 999 | |
1e1ea69f PT |
1000 | argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0); |
1001 | ||
d540b70c DL |
1002 | if (cleanup_arg) |
1003 | /* | |
1004 | * this only checks the validity of cleanup_arg; we don't need | |
1005 | * a valid value for use_editor | |
1006 | */ | |
1007 | get_cleanup_mode(cleanup_arg, 0); | |
1008 | ||
f2c5baa1 PT |
1009 | parse_repo_refspecs(argc, argv, &repo, &refspecs); |
1010 | ||
adc27d6a | 1011 | if (!opt_ff) { |
a9de9897 | 1012 | opt_ff = xstrdup_or_null(config_get_ff()); |
adc27d6a EN |
1013 | /* |
1014 | * A subtle point: opt_ff was set on the line above via | |
1015 | * reading from config. opt_rebase, in contrast, is set | |
1016 | * before this point via command line options. The setting | |
1017 | * of opt_rebase via reading from config (using | |
1018 | * config_get_rebase()) does not happen until later. We | |
1019 | * are relying on the next if-condition happening before | |
1020 | * the config_get_rebase() call so that an explicit | |
1021 | * "--rebase" can override a config setting of | |
1022 | * pull.ff=only. | |
1023 | */ | |
1024 | if (opt_rebase >= 0 && opt_ff && !strcmp(opt_ff, "--ff-only")) | |
1025 | opt_ff = "--ff"; | |
1026 | } | |
a9de9897 | 1027 | |
81dbd768 | 1028 | if (opt_rebase < 0) |
b044db91 | 1029 | opt_rebase = config_get_rebase(&rebase_unspecified); |
81dbd768 | 1030 | |
4a4cf9e8 | 1031 | if (read_cache_unmerged()) |
8785c425 | 1032 | die_resolve_conflict("pull"); |
4a4cf9e8 | 1033 | |
102de880 | 1034 | if (file_exists(git_path_merge_head(the_repository))) |
4a4cf9e8 PT |
1035 | die_conclude_merge(); |
1036 | ||
f9b11147 | 1037 | if (get_oid("HEAD", &orig_head)) |
1038 | oidclr(&orig_head); | |
fe911b8c | 1039 | |
8944969c | 1040 | if (opt_rebase) { |
3013d98d PB |
1041 | if (opt_autostash == -1) |
1042 | opt_autostash = config_autostash; | |
53c76dc0 | 1043 | |
f9b11147 | 1044 | if (is_null_oid(&orig_head) && !is_cache_unborn()) |
8944969c PT |
1045 | die(_("Updating an unborn branch with changes added to the index.")); |
1046 | ||
3013d98d | 1047 | if (!opt_autostash) |
5b02ca38 NTND |
1048 | require_clean_work_tree(the_repository, |
1049 | N_("pull with rebase"), | |
d8cc92ab | 1050 | _("please commit or stash them."), 1, 0); |
8944969c | 1051 | |
f9b11147 | 1052 | if (get_rebase_fork_point(&rebase_fork_point, repo, *refspecs)) |
1053 | oidclr(&rebase_fork_point); | |
8944969c | 1054 | } |
1678b81e | 1055 | |
f2c5baa1 PT |
1056 | if (run_fetch(repo, refspecs)) |
1057 | return 1; | |
1058 | ||
a32975f5 PT |
1059 | if (opt_dry_run) |
1060 | return 0; | |
1061 | ||
f9b11147 | 1062 | if (get_oid("HEAD", &curr_head)) |
1063 | oidclr(&curr_head); | |
fe911b8c | 1064 | |
f9b11147 | 1065 | if (!is_null_oid(&orig_head) && !is_null_oid(&curr_head) && |
9001dc2a | 1066 | !oideq(&orig_head, &curr_head)) { |
fe911b8c PT |
1067 | /* |
1068 | * The fetch involved updating the current branch. | |
1069 | * | |
1070 | * The working tree and the index file are still based on | |
1071 | * orig_head commit, but we are merging into curr_head. | |
1072 | * Update the working tree to match curr_head. | |
1073 | */ | |
1074 | ||
1075 | warning(_("fetch updated the current branch head.\n" | |
1076 | "fast-forwarding your working tree from\n" | |
f9b11147 | 1077 | "commit %s."), oid_to_hex(&orig_head)); |
fe911b8c | 1078 | |
7e196c3a NTND |
1079 | if (checkout_fast_forward(the_repository, &orig_head, |
1080 | &curr_head, 0)) | |
fe911b8c PT |
1081 | die(_("Cannot fast-forward your working tree.\n" |
1082 | "After making sure that you saved anything precious from\n" | |
1083 | "$ git diff %s\n" | |
1084 | "output, run\n" | |
1085 | "$ git reset --hard\n" | |
f9b11147 | 1086 | "to recover."), oid_to_hex(&orig_head)); |
fe911b8c PT |
1087 | } |
1088 | ||
44c175c7 PT |
1089 | get_merge_heads(&merge_heads); |
1090 | ||
1091 | if (!merge_heads.nr) | |
1092 | die_no_merge_candidates(repo, refspecs); | |
1093 | ||
f9b11147 | 1094 | if (is_null_oid(&orig_head)) { |
49ec402d PT |
1095 | if (merge_heads.nr > 1) |
1096 | die(_("Cannot merge multiple branches into empty head.")); | |
ee3051bd | 1097 | return pull_into_void(merge_heads.oid, &curr_head); |
33b842a1 | 1098 | } |
6f843a33 EN |
1099 | if (merge_heads.nr > 1) { |
1100 | if (opt_rebase) | |
1101 | die(_("Cannot rebase onto multiple branches.")); | |
1102 | if (opt_ff && !strcmp(opt_ff, "--ff-only")) | |
1103 | die(_("Cannot fast-forward to multiple branches.")); | |
1104 | } | |
33b842a1 | 1105 | |
6f843a33 | 1106 | can_ff = get_can_ff(&orig_head, &merge_heads); |
ea1954af | 1107 | divergent = !can_ff && !already_up_to_date(&orig_head, &merge_heads); |
c525de33 | 1108 | |
e4dc25ed EN |
1109 | /* ff-only takes precedence over rebase */ |
1110 | if (opt_ff && !strcmp(opt_ff, "--ff-only")) { | |
ea1954af | 1111 | if (divergent) |
e4dc25ed EN |
1112 | die_ff_impossible(); |
1113 | opt_rebase = REBASE_FALSE; | |
278f4be8 | 1114 | } |
e4dc25ed | 1115 | /* If no action specified and we can't fast forward, then warn. */ |
ea1954af | 1116 | if (!opt_ff && rebase_unspecified && divergent) { |
e4dc25ed | 1117 | show_advice_pull_non_ff(); |
031e2f7a EN |
1118 | die(_("Need to specify how to reconcile divergent branches.")); |
1119 | } | |
278f4be8 | 1120 | |
33b842a1 | 1121 | if (opt_rebase) { |
a6d7eb2c | 1122 | int ret = 0; |
4f66d79a PB |
1123 | |
1124 | struct object_id newbase; | |
1125 | struct object_id upstream; | |
1126 | get_rebase_newbase_and_upstream(&newbase, &upstream, &curr_head, | |
1127 | merge_heads.oid, &rebase_fork_point); | |
1128 | ||
a6d7eb2c SB |
1129 | if ((recurse_submodules == RECURSE_SUBMODULES_ON || |
1130 | recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) && | |
5176f20f | 1131 | submodule_touches_in_range(the_repository, &upstream, &curr_head)) |
a6d7eb2c | 1132 | die(_("cannot rebase with locally recorded submodule modifications")); |
34006224 FC |
1133 | |
1134 | if (can_ff) { | |
1135 | /* we can fast-forward this without invoking rebase */ | |
1136 | opt_ff = "--ff-only"; | |
34006224 | 1137 | ret = run_merge(); |
a751e029 | 1138 | } else { |
4f66d79a | 1139 | ret = run_rebase(&newbase, &upstream); |
a751e029 | 1140 | } |
a6d7eb2c SB |
1141 | |
1142 | if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON || | |
1143 | recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)) | |
1144 | ret = rebase_submodules(); | |
1145 | ||
1146 | return ret; | |
33b842a1 | 1147 | } else { |
a6d7eb2c SB |
1148 | int ret = run_merge(); |
1149 | if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON || | |
1150 | recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)) | |
1151 | ret = update_submodules(); | |
1152 | return ret; | |
33b842a1 | 1153 | } |
1e1ea69f | 1154 | } |