]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/rebase.c
projects / thirdparty / git.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Sync with 2.26.2
[thirdparty/git.git] / builtin / rebase.c
CommitLineData
55071ea2
PK		 1/*
2 * "git rebase" builtin command
3 *
4 * Copyright (c) 2018 Pratik Karki
5 */
6
f8adbec9 7#define USE_THE_INDEX_COMPATIBILITY_MACROS
55071ea2
PK		 8#include "builtin.h"
9#include "run-command.h"
10#include "exec-cmd.h"
11#include "argv-array.h"
12#include "dir.h"
ac7f467f
PK		 13#include "packfile.h"
14#include "refs.h"
15#include "quote.h"
16#include "config.h"
17#include "cache-tree.h"
18#include "unpack-trees.h"
19#include "lockfile.h"
f28d40d3 20#include "parse-options.h"
075bc852 21#include "commit.h"
bff014da 22#include "diff.h"
e0333e5c 23#include "wt-status.h"
9a48a615 24#include "revision.h"
e0720a38 25#include "commit-reach.h"
122420c2 26#include "rerere.h"
5aec9271 27#include "branch.h"
0609b741
PW		 28#include "sequencer.h"
29#include "rebase-interactive.h"
f28d40d3
PK		 30
31static char const * const builtin_rebase_usage[] = {
414d924b
DL		 32 N_("git rebase [-i] [options] [--exec <cmd>] "
33 "[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"),
f28d40d3
PK		 34 N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
35 "--root [<branch>]"),
36 N_("git rebase --continue | --abort | --skip | --edit-todo"),
37 NULL
38};
ac7f467f 39
0609b741
PW		 40static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto")
41static GIT_PATH_FUNC(path_interactive, "rebase-merge/interactive")
ac7f467f
PK		 42static GIT_PATH_FUNC(apply_dir, "rebase-apply")
43static GIT_PATH_FUNC(merge_dir, "rebase-merge")
44
45enum rebase_type {
46 REBASE_UNSPECIFIED = -1,
10cdb9f3 47 REBASE_APPLY,
ac7f467f 48 REBASE_MERGE,
ac7f467f
PK		 49 REBASE_PRESERVE_MERGES
50};
55071ea2 51
e98c4269
EN		 52enum empty_type {
53 EMPTY_UNSPECIFIED = -1,
54 EMPTY_DROP,
55 EMPTY_KEEP,
56 EMPTY_ASK
57};
58
ac7f467f
PK		 59struct rebase_options {
60 enum rebase_type type;
e98c4269 61 enum empty_type empty;
8295ed69 62 const char *default_backend;
ac7f467f
PK		 63 const char *state_dir;
64 struct commit *upstream;
65 const char *upstream_name;
06e4775a 66 const char *upstream_arg;
ac7f467f
PK		 67 char *head_name;
68 struct object_id orig_head;
69 struct commit *onto;
70 const char *onto_name;
71 const char *revisions;
e65123a7 72 const char *switch_to;
e1fac531 73 int root, root_with_onto;
9dba809a 74 struct object_id *squash_onto;
ac7f467f
PK		 75 struct commit *restrict_revision;
76 int dont_finish_rebase;
b4c8eb02
PK		 77 enum {
78 REBASE_NO_QUIET = 1<<0,
bff014da
PK		 79 REBASE_VERBOSE = 1<<1,
80 REBASE_DIFFSTAT = 1<<2,
1ed9c14f 81 REBASE_FORCE = 1<<3,
c54dacb5 82 REBASE_INTERACTIVE_EXPLICIT = 1<<4,
b4c8eb02 83 } flags;
f5769680 84 struct argv_array git_am_opts;
f9573628 85 const char *action;
73d51ed0 86 int signoff;
ead98c11 87 int allow_rerere_autoupdate;
051910a9 88 int autosquash;
12026a41 89 char *gpg_sign_opt;
6defce2b 90 int autostash;
68e46d78 91 char *cmd;
9b3a448b 92 int allow_empty_message;
3c3588c7 93 int rebase_merges, rebase_cousins;
ba1905a5 94 char *strategy, *strategy_opts;
cda614e4 95 struct strbuf git_format_patch_opt;
d421afa0 96 int reschedule_failed_exec;
d03ebd41 97 int use_legacy_rebase;
ac7f467f
PK		 98};
99
73fdc535
PW		 100#define REBASE_OPTIONS_INIT { \
101 .type = REBASE_UNSPECIFIED, \
e98c4269 102 .empty = EMPTY_UNSPECIFIED, \
2ac0d627 103 .default_backend = "merge", \
73fdc535
PW		 104 .flags = REBASE_NO_QUIET, \
105 .git_am_opts = ARGV_ARRAY_INIT, \
106 .git_format_patch_opt = STRBUF_INIT \
107 }
108
109static struct replay_opts get_replay_opts(const struct rebase_options *opts)
110{
111 struct replay_opts replay = REPLAY_OPTS_INIT;
112
113 replay.action = REPLAY_INTERACTIVE_REBASE;
114 sequencer_init_config(&replay);
115
116 replay.signoff = opts->signoff;
117 replay.allow_ff = !(opts->flags & REBASE_FORCE);
118 if (opts->allow_rerere_autoupdate)
119 replay.allow_rerere_auto = opts->allow_rerere_autoupdate;
120 replay.allow_empty = 1;
121 replay.allow_empty_message = opts->allow_empty_message;
e98c4269
EN		 122 replay.drop_redundant_commits = (opts->empty == EMPTY_DROP);
123 replay.keep_redundant_commits = (opts->empty == EMPTY_KEEP);
55d2b6d7 124 replay.quiet = !(opts->flags & REBASE_NO_QUIET);
73fdc535
PW		 125 replay.verbose = opts->flags & REBASE_VERBOSE;
126 replay.reschedule_failed_exec = opts->reschedule_failed_exec;
127 replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
128 replay.strategy = opts->strategy;
0ea0847e 129 if (opts->strategy_opts)
4d924528 130 parse_strategy_opts(&replay, opts->strategy_opts);
73fdc535 131
a2dd67f1
AG		 132 if (opts->squash_onto) {
133 oidcpy(&replay.squash_onto, opts->squash_onto);
134 replay.have_squash_onto = 1;
135 }
136
73fdc535
PW		 137 return replay;
138}
139
297b1e17
PW		 140enum action {
141 ACTION_NONE = 0,
142 ACTION_CONTINUE,
143 ACTION_SKIP,
144 ACTION_ABORT,
145 ACTION_QUIT,
146 ACTION_EDIT_TODO,
147 ACTION_SHOW_CURRENT_PATCH,
148 ACTION_SHORTEN_OIDS,
149 ACTION_EXPAND_OIDS,
150 ACTION_CHECK_TODO_LIST,
151 ACTION_REARRANGE_SQUASH,
152 ACTION_ADD_EXEC
153};
154
155static const char *action_names[] = { "undefined",
156 "continue",
157 "skip",
158 "abort",
159 "quit",
160 "edit_todo",
161 "show_current_patch" };
162
0609b741
PW		 163static int add_exec_commands(struct string_list *commands)
164{
165 const char *todo_file = rebase_path_todo();
166 struct todo_list todo_list = TODO_LIST_INIT;
167 int res;
168
169 if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
170 return error_errno(_("could not read '%s'."), todo_file);
171
172 if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
173 &todo_list)) {
174 todo_list_release(&todo_list);
175 return error(_("unusable todo list: '%s'"), todo_file);
176 }
177
178 todo_list_add_exec_commands(&todo_list, commands);
179 res = todo_list_write_to_file(the_repository, &todo_list,
180 todo_file, NULL, NULL, -1, 0);
181 todo_list_release(&todo_list);
182
183 if (res)
184 return error_errno(_("could not write '%s'."), todo_file);
185 return 0;
186}
187
188static int rearrange_squash_in_todo_file(void)
189{
190 const char *todo_file = rebase_path_todo();
191 struct todo_list todo_list = TODO_LIST_INIT;
192 int res = 0;
193
194 if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
195 return error_errno(_("could not read '%s'."), todo_file);
196 if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
197 &todo_list)) {
198 todo_list_release(&todo_list);
199 return error(_("unusable todo list: '%s'"), todo_file);
200 }
201
202 res = todo_list_rearrange_squash(&todo_list);
203 if (!res)
204 res = todo_list_write_to_file(the_repository, &todo_list,
205 todo_file, NULL, NULL, -1, 0);
206
207 todo_list_release(&todo_list);
208
209 if (res)
210 return error_errno(_("could not write '%s'."), todo_file);
211 return 0;
212}
213
214static int transform_todo_file(unsigned flags)
215{
216 const char *todo_file = rebase_path_todo();
217 struct todo_list todo_list = TODO_LIST_INIT;
218 int res;
219
220 if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
221 return error_errno(_("could not read '%s'."), todo_file);
222
223 if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
224 &todo_list)) {
225 todo_list_release(&todo_list);
226 return error(_("unusable todo list: '%s'"), todo_file);
227 }
228
229 res = todo_list_write_to_file(the_repository, &todo_list, todo_file,
230 NULL, NULL, -1, flags);
231 todo_list_release(&todo_list);
232
233 if (res)
234 return error_errno(_("could not write '%s'."), todo_file);
235 return 0;
236}
237
238static int edit_todo_file(unsigned flags)
239{
240 const char *todo_file = rebase_path_todo();
241 struct todo_list todo_list = TODO_LIST_INIT,
242 new_todo = TODO_LIST_INIT;
243 int res = 0;
244
245 if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
246 return error_errno(_("could not read '%s'."), todo_file);
247
248 strbuf_stripspace(&todo_list.buf, 1);
249 res = edit_todo_list(the_repository, &todo_list, &new_todo, NULL, NULL, flags);
250 if (!res && todo_list_write_to_file(the_repository, &new_todo, todo_file,
251 NULL, NULL, -1, flags & ~(TODO_LIST_SHORTEN_IDS)))
252 res = error_errno(_("could not write '%s'"), todo_file);
253
254 todo_list_release(&todo_list);
255 todo_list_release(&new_todo);
256
257 return res;
258}
259
7d3488eb 260static int get_revision_ranges(struct commit *upstream, struct commit *onto,
767a9c41 261 struct object_id *orig_head, const char **head_hash,
0609b741
PW		 262 char **revisions, char **shortrevisions)
263{
7d3488eb
PW		 264 struct commit *base_rev = upstream ? upstream : onto;
265 const char *shorthead;
0609b741 266
767a9c41 267 *head_hash = find_unique_abbrev(orig_head, GIT_MAX_HEXSZ);
7d3488eb
PW		 268 *revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid),
269 *head_hash);
0609b741 270
767a9c41 271 shorthead = find_unique_abbrev(orig_head, DEFAULT_ABBREV);
0609b741
PW		 272
273 if (upstream) {
274 const char *shortrev;
0609b741 275
7d3488eb
PW		 276 shortrev = find_unique_abbrev(&base_rev->object.oid,
277 DEFAULT_ABBREV);
0609b741
PW		 278
279 *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead);
280 } else
281 *shortrevisions = xstrdup(shorthead);
282
283 return 0;
284}
285
286static int init_basic_state(struct replay_opts *opts, const char *head_name,
7d3488eb 287 struct commit *onto, const char *orig_head)
0609b741
PW		 288{
289 FILE *interactive;
290
c44c2462
PW		 291 if (!is_directory(merge_dir()) && mkdir_in_gitdir(merge_dir()))
292 return error_errno(_("could not create temporary %s"), merge_dir());
0609b741
PW		 293
294 delete_reflog("REBASE_HEAD");
295
296 interactive = fopen(path_interactive(), "w");
297 if (!interactive)
298 return error_errno(_("could not mark as interactive"));
299 fclose(interactive);
300
301 return write_basic_state(opts, head_name, onto, orig_head);
302}
303
0ea0847e
PW		 304static void split_exec_commands(const char *cmd, struct string_list *commands)
305{
306 if (cmd && *cmd) {
307 string_list_split(commands, cmd, '\n', -1);
308
309 /* rebase.c adds a new line to cmd after every command,
310 * so here the last command is always empty */
311 string_list_remove_empty_items(commands, 0);
312 }
313}
314
315static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
0609b741
PW		 316{
317 int ret;
318 const char *head_hash = NULL;
319 char *revisions = NULL, *shortrevisions = NULL;
320 struct argv_array make_script_args = ARGV_ARRAY_INIT;
321 struct todo_list todo_list = TODO_LIST_INIT;
0ea0847e
PW		 322 struct replay_opts replay = get_replay_opts(opts);
323 struct string_list commands = STRING_LIST_INIT_DUP;
0609b741 324
767a9c41
AG		 325 if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head,
326 &head_hash, &revisions, &shortrevisions))
0609b741
PW		 327 return -1;
328
460bc3ce
PW		 329 if (init_basic_state(&replay,
330 opts->head_name ? opts->head_name : "detached HEAD",
331 opts->onto, head_hash)) {
0609b741
PW		 332 free(revisions);
333 free(shortrevisions);
334
335 return -1;
336 }
337
0ea0847e 338 if (!opts->upstream && opts->squash_onto)
33898531 339 write_file(path_squash_onto(), "%s\n",
0ea0847e 340 oid_to_hex(opts->squash_onto));
0609b741
PW		 341
342 argv_array_pushl(&make_script_args, "", revisions, NULL);
0ea0847e 343 if (opts->restrict_revision)
93122c98
EN		 344 argv_array_pushf(&make_script_args, "^%s",
345 oid_to_hex(&opts->restrict_revision->object.oid));
0609b741
PW		 346
347 ret = sequencer_make_script(the_repository, &todo_list.buf,
348 make_script_args.argc, make_script_args.argv,
349 flags);
350
351 if (ret)
352 error(_("could not generate todo list"));
353 else {
354 discard_cache();
355 if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
356 &todo_list))
357 BUG("unusable todo list");
358
0ea0847e
PW		 359 split_exec_commands(opts->cmd, &commands);
360 ret = complete_action(the_repository, &replay, flags,
361 shortrevisions, opts->onto_name, opts->onto, head_hash,
362 &commands, opts->autosquash, &todo_list);
0609b741
PW		 363 }
364
0ea0847e 365 string_list_clear(&commands, 0);
0609b741
PW		 366 free(revisions);
367 free(shortrevisions);
368 todo_list_release(&todo_list);
369 argv_array_clear(&make_script_args);
370
371 return ret;
372}
373
10cdb9f3 374static int run_sequencer_rebase(struct rebase_options *opts,
460bc3ce
PW		 375 enum action command)
376{
377 unsigned flags = 0;
378 int abbreviate_commands = 0, ret = 0;
379
380 git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
381
460bc3ce
PW		 382 flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
383 flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
384 flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
e1fac531 385 flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
460bc3ce
PW		 386 flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
387
388 switch (command) {
389 case ACTION_NONE: {
390 if (!opts->onto && !opts->upstream)
391 die(_("a base commit must be provided with --upstream or --onto"));
392
393 ret = do_interactive_rebase(opts, flags);
394 break;
395 }
396 case ACTION_SKIP: {
397 struct string_list merge_rr = STRING_LIST_INIT_DUP;
398
399 rerere_clear(the_repository, &merge_rr);
400 }
401 /* fallthrough */
402 case ACTION_CONTINUE: {
403 struct replay_opts replay_opts = get_replay_opts(opts);
404
405 ret = sequencer_continue(the_repository, &replay_opts);
406 break;
407 }
408 case ACTION_EDIT_TODO:
409 ret = edit_todo_file(flags);
410 break;
411 case ACTION_SHOW_CURRENT_PATCH: {
412 struct child_process cmd = CHILD_PROCESS_INIT;
413
414 cmd.git_cmd = 1;
415 argv_array_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL);
416 ret = run_command(&cmd);
417
418 break;
419 }
420 case ACTION_SHORTEN_OIDS:
421 case ACTION_EXPAND_OIDS:
422 ret = transform_todo_file(flags);
423 break;
424 case ACTION_CHECK_TODO_LIST:
425 ret = check_todo_list_from_file(the_repository);
426 break;
427 case ACTION_REARRANGE_SQUASH:
428 ret = rearrange_squash_in_todo_file();
429 break;
430 case ACTION_ADD_EXEC: {
431 struct string_list commands = STRING_LIST_INIT_DUP;
432
433 split_exec_commands(opts->cmd, &commands);
434 ret = add_exec_commands(&commands);
435 string_list_clear(&commands, 0);
436 break;
437 }
438 default:
439 BUG("invalid command '%d'", command);
440 }
441
442 return ret;
443}
444
d48e5e21
EN		 445static int parse_opt_keep_empty(const struct option *opt, const char *arg,
446 int unset)
447{
448 struct rebase_options *opts = opt->value;
449
450 BUG_ON_OPT_ARG(arg);
451
e98c4269
EN		 452 /*
453 * If we ever want to remap --keep-empty to --empty=keep, insert:
454 * opts->empty = unset ? EMPTY_UNSPECIFIED : EMPTY_KEEP;
455 */
10cdb9f3 456 opts->type = REBASE_MERGE;
d48e5e21
EN		 457 return 0;
458}
459
0609b741
PW		 460static const char * const builtin_rebase_interactive_usage[] = {
461 N_("git rebase--interactive [<options>]"),
462 NULL
463};
464
465int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
466{
73fdc535 467 struct rebase_options opts = REBASE_OPTIONS_INIT;
33898531 468 struct object_id squash_onto = null_oid;
297b1e17 469 enum action command = ACTION_NONE;
0609b741 470 struct option options[] = {
73fdc535
PW		 471 OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
472 REBASE_FORCE),
d48e5e21
EN		 473 { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
474 N_("(DEPRECATED) keep empty commits"),
475 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
476 parse_opt_keep_empty },
22a69fda
EN		 477 OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
478 N_("allow commits with empty messages"),
479 PARSE_OPT_HIDDEN),
73fdc535
PW		 480 OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")),
481 OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
0609b741 482 N_("keep original branch points of cousins")),
73fdc535 483 OPT_BOOL(0, "autosquash", &opts.autosquash,
0609b741
PW		 484 N_("move commits that begin with squash!/fixup!")),
485 OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
73fdc535
PW		 486 OPT_BIT('v', "verbose", &opts.flags,
487 N_("display a diffstat of what changed upstream"),
488 REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
0609b741 489 OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
297b1e17
PW		 490 ACTION_CONTINUE),
491 OPT_CMDMODE(0, "skip", &command, N_("skip commit"), ACTION_SKIP),
0609b741 492 OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
297b1e17 493 ACTION_EDIT_TODO),
0609b741 494 OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
297b1e17 495 ACTION_SHOW_CURRENT_PATCH),
0609b741 496 OPT_CMDMODE(0, "shorten-ids", &command,
297b1e17 497 N_("shorten commit ids in the todo list"), ACTION_SHORTEN_OIDS),
0609b741 498 OPT_CMDMODE(0, "expand-ids", &command,
297b1e17 499 N_("expand commit ids in the todo list"), ACTION_EXPAND_OIDS),
0609b741 500 OPT_CMDMODE(0, "check-todo-list", &command,
297b1e17 501 N_("check the todo list"), ACTION_CHECK_TODO_LIST),
0609b741 502 OPT_CMDMODE(0, "rearrange-squash", &command,
297b1e17 503 N_("rearrange fixup/squash lines"), ACTION_REARRANGE_SQUASH),
0609b741 504 OPT_CMDMODE(0, "add-exec-commands", &command,
297b1e17 505 N_("insert exec commands in todo list"), ACTION_ADD_EXEC),
73fdc535 506 { OPTION_CALLBACK, 0, "onto", &opts.onto, N_("onto"), N_("onto"),
7d3488eb 507 PARSE_OPT_NONEG, parse_opt_commit, 0 },
73fdc535 508 { OPTION_CALLBACK, 0, "restrict-revision", &opts.restrict_revision,
7d3488eb
PW		 509 N_("restrict-revision"), N_("restrict revision"),
510 PARSE_OPT_NONEG, parse_opt_commit, 0 },
33898531
PW		 511 { OPTION_CALLBACK, 0, "squash-onto", &squash_onto, N_("squash-onto"),
512 N_("squash onto"), PARSE_OPT_NONEG, parse_opt_object_id, 0 },
73fdc535 513 { OPTION_CALLBACK, 0, "upstream", &opts.upstream, N_("upstream"),
7d3488eb
PW		 514 N_("the upstream commit"), PARSE_OPT_NONEG, parse_opt_commit,
515 0 },
73fdc535
PW		 516 OPT_STRING(0, "head-name", &opts.head_name, N_("head-name"), N_("head name")),
517 { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign_opt, N_("key-id"),
0609b741
PW		 518 N_("GPG-sign commits"),
519 PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
520 OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
521 N_("rebase strategy")),
73fdc535 522 OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
0609b741 523 N_("strategy options")),
73fdc535 524 OPT_STRING(0, "switch-to", &opts.switch_to, N_("switch-to"),
0609b741 525 N_("the branch or commit to checkout")),
73fdc535
PW		 526 OPT_STRING(0, "onto-name", &opts.onto_name, N_("onto-name"), N_("onto name")),
527 OPT_STRING(0, "cmd", &opts.cmd, N_("cmd"), N_("the command to run")),
528 OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_autoupdate),
0609b741
PW		 529 OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec,
530 N_("automatically re-schedule any `exec` that fails")),
531 OPT_END()
532 };
533
73fdc535 534 opts.rebase_cousins = -1;
0609b741 535
0609b741
PW		 536 if (argc == 1)
537 usage_with_options(builtin_rebase_interactive_usage, options);
538
c0e78f7e 539 argc = parse_options(argc, argv, prefix, options,
0609b741
PW		 540 builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
541
33898531 542 if (!is_null_oid(&squash_onto))
73fdc535 543 opts.squash_onto = &squash_onto;
33898531 544
73fdc535 545 if (opts.rebase_cousins >= 0 && !opts.rebase_merges)
0609b741
PW		 546 warning(_("--[no-]rebase-cousins has no effect without "
547 "--rebase-merges"));
548
10cdb9f3 549 return !!run_sequencer_rebase(&opts, command);
0609b741
PW		 550}
551
10cdb9f3 552static int is_merge(struct rebase_options *opts)
9a48a615 553{
10cdb9f3 554 return opts->type == REBASE_MERGE ||
9a48a615
PK		 555 opts->type == REBASE_PRESERVE_MERGES;
556}
557
10cdb9f3 558static void imply_merge(struct rebase_options *opts, const char *option)
002ee2fe
PK		 559{
560 switch (opts->type) {
10cdb9f3 561 case REBASE_APPLY:
002ee2fe
PK		 562 die(_("%s requires an interactive rebase"), option);
563 break;
10cdb9f3 564 case REBASE_MERGE:
002ee2fe
PK		 565 case REBASE_PRESERVE_MERGES:
566 break;
002ee2fe 567 default:
10cdb9f3 568 opts->type = REBASE_MERGE; /* implied */
002ee2fe
PK		 569 break;
570 }
571}
572
ac7f467f
PK		 573/* Returns the filename prefixed by the state_dir */
574static const char *state_dir_path(const char *filename, struct rebase_options *opts)
575{
576 static struct strbuf path = STRBUF_INIT;
577 static size_t prefix_len;
578
579 if (!prefix_len) {
580 strbuf_addf(&path, "%s/", opts->state_dir);
581 prefix_len = path.len;
582 }
583
584 strbuf_setlen(&path, prefix_len);
585 strbuf_addstr(&path, filename);
586 return path.buf;
587}
588
f9573628
PK		 589/* Read one file, then strip line endings */
590static int read_one(const char *path, struct strbuf *buf)
591{
592 if (strbuf_read_file(buf, path, 0) < 0)
593 return error_errno(_("could not read '%s'"), path);
594 strbuf_trim_trailing_newline(buf);
595 return 0;
596}
597
598/* Initialize the rebase options from the state directory. */
599static int read_basic_state(struct rebase_options *opts)
600{
601 struct strbuf head_name = STRBUF_INIT;
602 struct strbuf buf = STRBUF_INIT;
603 struct object_id oid;
604
605 if (read_one(state_dir_path("head-name", opts), &head_name) ||
606 read_one(state_dir_path("onto", opts), &buf))
607 return -1;
608 opts->head_name = starts_with(head_name.buf, "refs/") ?
609 xstrdup(head_name.buf) : NULL;
610 strbuf_release(&head_name);
611 if (get_oid(buf.buf, &oid))
612 return error(_("could not get 'onto': '%s'"), buf.buf);
613 opts->onto = lookup_commit_or_die(&oid, buf.buf);
614
615 /*
616 * We always write to orig-head, but interactive rebase used to write to
617 * head. Fall back to reading from head to cover for the case that the
618 * user upgraded git with an ongoing interactive rebase.
619 */
620 strbuf_reset(&buf);
621 if (file_exists(state_dir_path("orig-head", opts))) {
622 if (read_one(state_dir_path("orig-head", opts), &buf))
623 return -1;
624 } else if (read_one(state_dir_path("head", opts), &buf))
625 return -1;
626 if (get_oid(buf.buf, &opts->orig_head))
627 return error(_("invalid orig-head: '%s'"), buf.buf);
628
899b49c4 629 if (file_exists(state_dir_path("quiet", opts)))
f9573628
PK		 630 opts->flags &= ~REBASE_NO_QUIET;
631 else
632 opts->flags |= REBASE_NO_QUIET;
633
634 if (file_exists(state_dir_path("verbose", opts)))
635 opts->flags |= REBASE_VERBOSE;
636
73d51ed0
PK		 637 if (file_exists(state_dir_path("signoff", opts))) {
638 opts->signoff = 1;
639 opts->flags |= REBASE_FORCE;
640 }
641
ead98c11
PK		 642 if (file_exists(state_dir_path("allow_rerere_autoupdate", opts))) {
643 strbuf_reset(&buf);
644 if (read_one(state_dir_path("allow_rerere_autoupdate", opts),
645 &buf))
646 return -1;
647 if (!strcmp(buf.buf, "--rerere-autoupdate"))
6023c928 648 opts->allow_rerere_autoupdate = RERERE_AUTOUPDATE;
ead98c11 649 else if (!strcmp(buf.buf, "--no-rerere-autoupdate"))
6023c928 650 opts->allow_rerere_autoupdate = RERERE_NOAUTOUPDATE;
ead98c11
PK		 651 else
652 warning(_("ignoring invalid allow_rerere_autoupdate: "
653 "'%s'"), buf.buf);
6023c928 654 }
ead98c11 655
12026a41
PK		 656 if (file_exists(state_dir_path("gpg_sign_opt", opts))) {
657 strbuf_reset(&buf);
658 if (read_one(state_dir_path("gpg_sign_opt", opts),
659 &buf))
660 return -1;
661 free(opts->gpg_sign_opt);
662 opts->gpg_sign_opt = xstrdup(buf.buf);
663 }
664
ba1905a5
PK		 665 if (file_exists(state_dir_path("strategy", opts))) {
666 strbuf_reset(&buf);
667 if (read_one(state_dir_path("strategy", opts), &buf))
668 return -1;
669 free(opts->strategy);
670 opts->strategy = xstrdup(buf.buf);
671 }
672
673 if (file_exists(state_dir_path("strategy_opts", opts))) {
674 strbuf_reset(&buf);
675 if (read_one(state_dir_path("strategy_opts", opts), &buf))
676 return -1;
677 free(opts->strategy_opts);
678 opts->strategy_opts = xstrdup(buf.buf);
679 }
680
f9573628
PK		 681 strbuf_release(&buf);
682
683 return 0;
684}
685
28dc09de 686static int rebase_write_basic_state(struct rebase_options *opts)
21853626
JS		 687{
688 write_file(state_dir_path("head-name", opts), "%s",
689 opts->head_name ? opts->head_name : "detached HEAD");
690 write_file(state_dir_path("onto", opts), "%s",
691 opts->onto ? oid_to_hex(&opts->onto->object.oid) : "");
692 write_file(state_dir_path("orig-head", opts), "%s",
693 oid_to_hex(&opts->orig_head));
8a997ed1
EN		 694 if (!(opts->flags & REBASE_NO_QUIET))
695 write_file(state_dir_path("quiet", opts), "%s", "");
21853626
JS		 696 if (opts->flags & REBASE_VERBOSE)
697 write_file(state_dir_path("verbose", opts), "%s", "");
698 if (opts->strategy)
699 write_file(state_dir_path("strategy", opts), "%s",
700 opts->strategy);
701 if (opts->strategy_opts)
702 write_file(state_dir_path("strategy_opts", opts), "%s",
703 opts->strategy_opts);
6023c928 704 if (opts->allow_rerere_autoupdate > 0)
21853626
JS		 705 write_file(state_dir_path("allow_rerere_autoupdate", opts),
706 "-%s-rerere-autoupdate",
6023c928
PW		 707 opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
708 "" : "-no");
21853626
JS		 709 if (opts->gpg_sign_opt)
710 write_file(state_dir_path("gpg_sign_opt", opts), "%s",
711 opts->gpg_sign_opt);
712 if (opts->signoff)
4fe7e43c 713 write_file(state_dir_path("signoff", opts), "--signoff");
21853626
JS		 714
715 return 0;
716}
717
6defce2b
PK		 718static int apply_autostash(struct rebase_options *opts)
719{
720 const char *path = state_dir_path("autostash", opts);
721 struct strbuf autostash = STRBUF_INIT;
722 struct child_process stash_apply = CHILD_PROCESS_INIT;
723
724 if (!file_exists(path))
725 return 0;
726
71064e60 727 if (read_one(path, &autostash))
6defce2b 728 return error(_("Could not read '%s'"), path);
b98e914e
JS		 729 /* Ensure that the hash is not mistaken for a number */
730 strbuf_addstr(&autostash, "^0");
6defce2b
PK		 731 argv_array_pushl(&stash_apply.args,
732 "stash", "apply", autostash.buf, NULL);
733 stash_apply.git_cmd = 1;
734 stash_apply.no_stderr = stash_apply.no_stdout =
735 stash_apply.no_stdin = 1;
736 if (!run_command(&stash_apply))
737 printf(_("Applied autostash.\n"));
738 else {
739 struct argv_array args = ARGV_ARRAY_INIT;
740 int res = 0;
741
742 argv_array_pushl(&args,
743 "stash", "store", "-m", "autostash", "-q",
744 autostash.buf, NULL);
745 if (run_command_v_opt(args.argv, RUN_GIT_CMD))
746 res = error(_("Cannot store %s"), autostash.buf);
747 argv_array_clear(&args);
748 strbuf_release(&autostash);
749 if (res)
750 return res;
751
752 fprintf(stderr,
753 _("Applying autostash resulted in conflicts.\n"
754 "Your changes are safe in the stash.\n"
755 "You can run \"git stash pop\" or \"git stash drop\" "
756 "at any time.\n"));
757 }
758
759 strbuf_release(&autostash);
760 return 0;
761}
762
ac7f467f
PK		 763static int finish_rebase(struct rebase_options *opts)
764{
765 struct strbuf dir = STRBUF_INIT;
766 const char *argv_gc_auto[] = { "gc", "--auto", NULL };
d3fce47d 767 int ret = 0;
ac7f467f
PK		 768
769 delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
6defce2b 770 apply_autostash(opts);
2d511cfc 771 close_object_store(the_repository->objects);
ac7f467f
PK		 772 /*
773 * We ignore errors in 'gc --auto', since the
774 * user should see them.
775 */
776 run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
10cdb9f3 777 if (opts->type == REBASE_MERGE) {
d559f502 778 struct replay_opts replay = REPLAY_OPTS_INIT;
ac7f467f 779
d559f502
PW		 780 replay.action = REPLAY_INTERACTIVE_REBASE;
781 ret = sequencer_remove_state(&replay);
782 } else {
783 strbuf_addstr(&dir, opts->state_dir);
784 if (remove_dir_recursively(&dir, 0))
785 ret = error(_("could not remove '%s'"),
786 opts->state_dir);
787 strbuf_release(&dir);
788 }
ac7f467f 789
d3fce47d 790 return ret;
ac7f467f
PK		 791}
792
793static struct commit *peel_committish(const char *name)
794{
795 struct object *obj;
796 struct object_id oid;
797
798 if (get_oid(name, &oid))
799 return NULL;
800 obj = parse_object(the_repository, &oid);
801 return (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
802}
803
804static void add_var(struct strbuf *buf, const char *name, const char *value)
805{
806 if (!value)
807 strbuf_addf(buf, "unset %s; ", name);
808 else {
809 strbuf_addf(buf, "%s=", name);
810 sq_quote_buf(buf, value);
811 strbuf_addstr(buf, "; ");
812 }
813}
814
c5233708
JS		 815#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
816
817#define RESET_HEAD_DETACH (1<<0)
818#define RESET_HEAD_HARD (1<<1)
e52c6bbd
JH		 819#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
820#define RESET_HEAD_REFS_ONLY (1<<3)
9fbcc3d2 821#define RESET_ORIG_HEAD (1<<4)
c5233708
JS		 822
823static int reset_head(struct object_id *oid, const char *action,
824 const char *switch_to_branch, unsigned flags,
825 const char *reflog_orig_head, const char *reflog_head)
826{
827 unsigned detach_head = flags & RESET_HEAD_DETACH;
828 unsigned reset_hard = flags & RESET_HEAD_HARD;
e52c6bbd 829 unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
414f3360 830 unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
cbd29ead 831 unsigned update_orig_head = flags & RESET_ORIG_HEAD;
c5233708
JS		 832 struct object_id head_oid;
833 struct tree_desc desc[2] = { { NULL }, { NULL } };
834 struct lock_file lock = LOCK_INIT;
835 struct unpack_trees_options unpack_tree_opts;
836 struct tree *tree;
837 const char *reflog_action;
838 struct strbuf msg = STRBUF_INIT;
839 size_t prefix_len;
840 struct object_id *orig = NULL, oid_orig,
841 *old_orig = NULL, oid_old_orig;
842 int ret = 0, nr = 0;
843
844 if (switch_to_branch && !starts_with(switch_to_branch, "refs/"))
845 BUG("Not a fully qualified branch: '%s'", switch_to_branch);
846
414f3360 847 if (!refs_only && hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) {
c5233708
JS		 848 ret = -1;
849 goto leave_reset_head;
850 }
851
852 if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) {
853 ret = error(_("could not determine HEAD revision"));
854 goto leave_reset_head;
855 }
856
857 if (!oid)
858 oid = &head_oid;
859
414f3360
JS		 860 if (refs_only)
861 goto reset_head_refs;
862
c5233708
JS		 863 memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
864 setup_unpack_trees_porcelain(&unpack_tree_opts, action);
865 unpack_tree_opts.head_idx = 1;
866 unpack_tree_opts.src_index = the_repository->index;
867 unpack_tree_opts.dst_index = the_repository->index;
868 unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
869 unpack_tree_opts.update = 1;
870 unpack_tree_opts.merge = 1;
3f267856 871 init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
c5233708
JS		 872 if (!detach_head)
873 unpack_tree_opts.reset = 1;
874
7589e636 875 if (repo_read_index_unmerged(the_repository) < 0) {
c5233708
JS		 876 ret = error(_("could not read index"));
877 goto leave_reset_head;
878 }
879
5e575807 880 if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) {
c5233708
JS		 881 ret = error(_("failed to find tree of %s"),
882 oid_to_hex(&head_oid));
883 goto leave_reset_head;
884 }
885
5e575807 886 if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) {
c5233708
JS		 887 ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
888 goto leave_reset_head;
889 }
890
891 if (unpack_trees(nr, desc, &unpack_tree_opts)) {
892 ret = -1;
893 goto leave_reset_head;
894 }
895
896 tree = parse_tree_indirect(oid);
e52c6bbd 897 prime_cache_tree(the_repository, the_repository->index, tree);
c5233708
JS		 898
899 if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) {
900 ret = error(_("could not write index"));
901 goto leave_reset_head;
902 }
903
414f3360 904reset_head_refs:
c5233708
JS		 905 reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
906 strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase");
907 prefix_len = msg.len;
908
cbd29ead
JS		 909 if (update_orig_head) {
910 if (!get_oid("ORIG_HEAD", &oid_old_orig))
911 old_orig = &oid_old_orig;
912 if (!get_oid("HEAD", &oid_orig)) {
913 orig = &oid_orig;
914 if (!reflog_orig_head) {
915 strbuf_addstr(&msg, "updating ORIG_HEAD");
916 reflog_orig_head = msg.buf;
917 }
918 update_ref(reflog_orig_head, "ORIG_HEAD", orig,
919 old_orig, 0, UPDATE_REFS_MSG_ON_ERR);
920 } else if (old_orig)
921 delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
922 }
923
c5233708
JS		 924 if (!reflog_head) {
925 strbuf_setlen(&msg, prefix_len);
926 strbuf_addstr(&msg, "updating HEAD");
927 reflog_head = msg.buf;
928 }
929 if (!switch_to_branch)
930 ret = update_ref(reflog_head, "HEAD", oid, orig,
931 detach_head ? REF_NO_DEREF : 0,
932 UPDATE_REFS_MSG_ON_ERR);
933 else {
eaf81605 934 ret = update_ref(reflog_head, switch_to_branch, oid,
5b2237a8 935 NULL, 0, UPDATE_REFS_MSG_ON_ERR);
c5233708 936 if (!ret)
5b2237a8
JS		 937 ret = create_symref("HEAD", switch_to_branch,
938 reflog_head);
c5233708 939 }
e52c6bbd
JH		 940 if (run_hook)
941 run_hook_le(NULL, "post-checkout",
942 oid_to_hex(orig ? orig : &null_oid),
943 oid_to_hex(oid), "1", NULL);
c5233708
JS		 944
945leave_reset_head:
946 strbuf_release(&msg);
947 rollback_lock_file(&lock);
948 while (nr)
949 free((void *)desc[--nr].buffer);
950 return ret;
951}
952
21853626
JS		 953static int move_to_original_branch(struct rebase_options *opts)
954{
955 struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
956 int ret;
957
958 if (!opts->head_name)
959 return 0; /* nothing to move back to */
960
961 if (!opts->onto)
962 BUG("move_to_original_branch without onto");
963
964 strbuf_addf(&orig_head_reflog, "rebase finished: %s onto %s",
965 opts->head_name, oid_to_hex(&opts->onto->object.oid));
966 strbuf_addf(&head_reflog, "rebase finished: returning to %s",
967 opts->head_name);
968 ret = reset_head(NULL, "", opts->head_name, RESET_HEAD_REFS_ONLY,
969 orig_head_reflog.buf, head_reflog.buf);
970
971 strbuf_release(&orig_head_reflog);
972 strbuf_release(&head_reflog);
973 return ret;
974}
975
bc24382c
JS		 976static const char *resolvemsg =
977N_("Resolve all conflicts manually, mark them as resolved with\n"
978"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
979"You can instead skip this commit: run \"git rebase --skip\".\n"
980"To abort and get back to the state before \"git rebase\", run "
981"\"git rebase --abort\".");
982
21853626
JS		 983static int run_am(struct rebase_options *opts)
984{
985 struct child_process am = CHILD_PROCESS_INIT;
986 struct child_process format_patch = CHILD_PROCESS_INIT;
987 struct strbuf revisions = STRBUF_INIT;
988 int status;
989 char *rebased_patches;
990
991 am.git_cmd = 1;
992 argv_array_push(&am.args, "am");
993
994 if (opts->action && !strcmp("continue", opts->action)) {
995 argv_array_push(&am.args, "--resolved");
996 argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
997 if (opts->gpg_sign_opt)
998 argv_array_push(&am.args, opts->gpg_sign_opt);
999 status = run_command(&am);
1000 if (status)
1001 return status;
1002
1003 return move_to_original_branch(opts);
1004 }
1005 if (opts->action && !strcmp("skip", opts->action)) {
1006 argv_array_push(&am.args, "--skip");
1007 argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
1008 status = run_command(&am);
1009 if (status)
1010 return status;
1011
1012 return move_to_original_branch(opts);
1013 }
1014 if (opts->action && !strcmp("show-current-patch", opts->action)) {
1015 argv_array_push(&am.args, "--show-current-patch");
1016 return run_command(&am);
1017 }
1018
1019 strbuf_addf(&revisions, "%s...%s",
1020 oid_to_hex(opts->root ?
1021 /* this is now equivalent to !opts->upstream */
1022 &opts->onto->object.oid :
1023 &opts->upstream->object.oid),
1024 oid_to_hex(&opts->orig_head));
1025
1026 rebased_patches = xstrdup(git_path("rebased-patches"));
1027 format_patch.out = open(rebased_patches,
1028 O_WRONLY | O_CREAT | O_TRUNC, 0666);
1029 if (format_patch.out < 0) {
1030 status = error_errno(_("could not open '%s' for writing"),
1031 rebased_patches);
1032 free(rebased_patches);
1033 argv_array_clear(&am.args);
1034 return status;
1035 }
1036
1037 format_patch.git_cmd = 1;
1038 argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
1039 "--full-index", "--cherry-pick", "--right-only",
1040 "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
cae0bc09
DL		 1041 "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
1042 "--no-base", NULL);
21853626
JS		 1043 if (opts->git_format_patch_opt.len)
1044 argv_array_split(&format_patch.args,
1045 opts->git_format_patch_opt.buf);
1046 argv_array_push(&format_patch.args, revisions.buf);
1047 if (opts->restrict_revision)
1048 argv_array_pushf(&format_patch.args, "^%s",
1049 oid_to_hex(&opts->restrict_revision->object.oid));
1050
1051 status = run_command(&format_patch);
1052 if (status) {
1053 unlink(rebased_patches);
1054 free(rebased_patches);
1055 argv_array_clear(&am.args);
1056
1057 reset_head(&opts->orig_head, "checkout", opts->head_name, 0,
1058 "HEAD", NULL);
1059 error(_("\ngit encountered an error while preparing the "
1060 "patches to replay\n"
1061 "these revisions:\n"
1062 "\n %s\n\n"
1063 "As a result, git cannot rebase them."),
1064 opts->revisions);
1065
1066 strbuf_release(&revisions);
1067 return status;
1068 }
1069 strbuf_release(&revisions);
1070
1071 am.in = open(rebased_patches, O_RDONLY);
1072 if (am.in < 0) {
1073 status = error_errno(_("could not open '%s' for reading"),
1074 rebased_patches);
1075 free(rebased_patches);
1076 argv_array_clear(&am.args);
1077 return status;
1078 }
1079
1080 argv_array_pushv(&am.args, opts->git_am_opts.argv);
1081 argv_array_push(&am.args, "--rebasing");
1082 argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
1083 argv_array_push(&am.args, "--patch-format=mboxrd");
6023c928 1084 if (opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE)
21853626 1085 argv_array_push(&am.args, "--rerere-autoupdate");
6023c928 1086 else if (opts->allow_rerere_autoupdate == RERERE_NOAUTOUPDATE)
21853626
JS		 1087 argv_array_push(&am.args, "--no-rerere-autoupdate");
1088 if (opts->gpg_sign_opt)
1089 argv_array_push(&am.args, opts->gpg_sign_opt);
1090 status = run_command(&am);
1091 unlink(rebased_patches);
1092 free(rebased_patches);
1093
1094 if (!status) {
1095 return move_to_original_branch(opts);
1096 }
1097
1098 if (is_directory(opts->state_dir))
28dc09de 1099 rebase_write_basic_state(opts);
21853626
JS		 1100
1101 return status;
1102}
1103
460bc3ce 1104static int run_specific_rebase(struct rebase_options *opts, enum action action)
ac7f467f
PK		 1105{
1106 const char *argv[] = { NULL, NULL };
f5769680 1107 struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
ac7f467f
PK		 1108 int status;
1109 const char *backend, *backend_func;
1110
10cdb9f3
EN		 1111 if (opts->type == REBASE_MERGE) {
1112 /* Run sequencer-based rebase */
460bc3ce 1113 setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1);
bc24382c 1114 if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
460bc3ce 1115 setenv("GIT_SEQUENCE_EDITOR", ":", 1);
bc24382c
JS		 1116 opts->autosquash = 0;
1117 }
460bc3ce
PW		 1118 if (opts->gpg_sign_opt) {
1119 /* remove the leading "-S" */
1120 char *tmp = xstrdup(opts->gpg_sign_opt + 2);
1121 free(opts->gpg_sign_opt);
1122 opts->gpg_sign_opt = tmp;
1123 }
bc24382c 1124
10cdb9f3 1125 status = run_sequencer_rebase(opts, action);
bc24382c
JS		 1126 goto finished_rebase;
1127 }
1128
10cdb9f3 1129 if (opts->type == REBASE_APPLY) {
21853626
JS		 1130 status = run_am(opts);
1131 goto finished_rebase;
1132 }
1133
ac7f467f
PK		 1134 add_var(&script_snippet, "GIT_DIR", absolute_path(get_git_dir()));
1135 add_var(&script_snippet, "state_dir", opts->state_dir);
1136
1137 add_var(&script_snippet, "upstream_name", opts->upstream_name);
f9573628
PK		 1138 add_var(&script_snippet, "upstream", opts->upstream ?
1139 oid_to_hex(&opts->upstream->object.oid) : NULL);
d4c569f8
PK		 1140 add_var(&script_snippet, "head_name",
1141 opts->head_name ? opts->head_name : "detached HEAD");
ac7f467f 1142 add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
f9573628
PK		 1143 add_var(&script_snippet, "onto", opts->onto ?
1144 oid_to_hex(&opts->onto->object.oid) : NULL);
ac7f467f
PK		 1145 add_var(&script_snippet, "onto_name", opts->onto_name);
1146 add_var(&script_snippet, "revisions", opts->revisions);
1147 add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
1148 oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
f5769680
JS		 1149 sq_quote_argv_pretty(&buf, opts->git_am_opts.argv);
1150 add_var(&script_snippet, "git_am_opt", buf.buf);
1151 strbuf_release(&buf);
bff014da
PK		 1152 add_var(&script_snippet, "verbose",
1153 opts->flags & REBASE_VERBOSE ? "t" : "");
1154 add_var(&script_snippet, "diffstat",
1155 opts->flags & REBASE_DIFFSTAT ? "t" : "");
1ed9c14f
PK		 1156 add_var(&script_snippet, "force_rebase",
1157 opts->flags & REBASE_FORCE ? "t" : "");
e65123a7
PK		 1158 if (opts->switch_to)
1159 add_var(&script_snippet, "switch_to", opts->switch_to);
f9573628 1160 add_var(&script_snippet, "action", opts->action ? opts->action : "");
73d51ed0 1161 add_var(&script_snippet, "signoff", opts->signoff ? "--signoff" : "");
ead98c11 1162 add_var(&script_snippet, "allow_rerere_autoupdate",
ead98c11 1163 opts->allow_rerere_autoupdate ?
6023c928
PW		 1164 opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
1165 "--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
051910a9 1166 add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
12026a41 1167 add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
68e46d78 1168 add_var(&script_snippet, "cmd", opts->cmd);
9b3a448b
PK		 1169 add_var(&script_snippet, "allow_empty_message",
1170 opts->allow_empty_message ? "--allow-empty-message" : "");
3c3588c7
PK		 1171 add_var(&script_snippet, "rebase_merges",
1172 opts->rebase_merges ? "t" : "");
1173 add_var(&script_snippet, "rebase_cousins",
1174 opts->rebase_cousins ? "t" : "");
ba1905a5
PK		 1175 add_var(&script_snippet, "strategy", opts->strategy);
1176 add_var(&script_snippet, "strategy_opts", opts->strategy_opts);
9dba809a
PK		 1177 add_var(&script_snippet, "rebase_root", opts->root ? "t" : "");
1178 add_var(&script_snippet, "squash_onto",
1179 opts->squash_onto ? oid_to_hex(opts->squash_onto) : "");
cda614e4
PK		 1180 add_var(&script_snippet, "git_format_patch_opt",
1181 opts->git_format_patch_opt.buf);
ac7f467f 1182
10cdb9f3 1183 if (is_merge(opts) &&
3dba9d08
PK		 1184 !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
1185 strbuf_addstr(&script_snippet,
891d4a03 1186 "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
3dba9d08
PK		 1187 opts->autosquash = 0;
1188 }
ac7f467f
PK		 1189
1190 switch (opts->type) {
ac7f467f
PK		 1191 case REBASE_PRESERVE_MERGES:
1192 backend = "git-rebase--preserve-merges";
1193 backend_func = "git_rebase__preserve_merges";
1194 break;
1195 default:
1196 BUG("Unhandled rebase type %d", opts->type);
1197 break;
1198 }
1199
1200 strbuf_addf(&script_snippet,
082ef75b 1201 ". git-sh-setup && . %s && %s", backend, backend_func);
ac7f467f
PK		 1202 argv[0] = script_snippet.buf;
1203
1204 status = run_command_v_opt(argv, RUN_USING_SHELL);
bc24382c 1205finished_rebase:
ac7f467f
PK		 1206 if (opts->dont_finish_rebase)
1207 ; /* do nothing */
10cdb9f3
EN		 1208 else if (opts->type == REBASE_MERGE)
1209 ; /* merge backend cleans up after itself */
ac7f467f
PK		 1210 else if (status == 0) {
1211 if (!file_exists(state_dir_path("stopped-sha", opts)))
1212 finish_rebase(opts);
1213 } else if (status == 2) {
1214 struct strbuf dir = STRBUF_INIT;
1215
6defce2b 1216 apply_autostash(opts);
ac7f467f
PK		 1217 strbuf_addstr(&dir, opts->state_dir);
1218 remove_dir_recursively(&dir, 0);
1219 strbuf_release(&dir);
1220 die("Nothing to do");
1221 }
1222
1223 strbuf_release(&script_snippet);
1224
1225 return status ? -1 : 0;
1226}
1227
bff014da
PK		 1228static int rebase_config(const char *var, const char *value, void *data)
1229{
1230 struct rebase_options *opts = data;
1231
1232 if (!strcmp(var, "rebase.stat")) {
1233 if (git_config_bool(var, value))
1234 opts->flags |= REBASE_DIFFSTAT;
1235 else
4c785c0e 1236 opts->flags &= ~REBASE_DIFFSTAT;
bff014da
PK		 1237 return 0;
1238 }
1239
051910a9
PK		 1240 if (!strcmp(var, "rebase.autosquash")) {
1241 opts->autosquash = git_config_bool(var, value);
1242 return 0;
1243 }
1244
12026a41
PK		 1245 if (!strcmp(var, "commit.gpgsign")) {
1246 free(opts->gpg_sign_opt);
1247 opts->gpg_sign_opt = git_config_bool(var, value) ?
1248 xstrdup("-S") : NULL;
1249 return 0;
1250 }
1251
6defce2b
PK		 1252 if (!strcmp(var, "rebase.autostash")) {
1253 opts->autostash = git_config_bool(var, value);
1254 return 0;
1255 }
1256
969de3ff
JS		 1257 if (!strcmp(var, "rebase.reschedulefailedexec")) {
1258 opts->reschedule_failed_exec = git_config_bool(var, value);
1259 return 0;
1260 }
1261
d03ebd41
ÆAB		 1262 if (!strcmp(var, "rebase.usebuiltin")) {
1263 opts->use_legacy_rebase = !git_config_bool(var, value);
1264 return 0;
1265 }
1266
8295ed69
EN		 1267 if (!strcmp(var, "rebase.backend")) {
1268 return git_config_string(&opts->default_backend, var, value);
1269 }
1270
bff014da
PK		 1271 return git_default_config(var, value, data);
1272}
1273
9a48a615
PK		 1274/*
1275 * Determines whether the commits in from..to are linear, i.e. contain
1276 * no merge commits. This function *expects* `from` to be an ancestor of
1277 * `to`.
1278 */
1279static int is_linear_history(struct commit *from, struct commit *to)
1280{
1281 while (to && to != from) {
1282 parse_commit(to);
1283 if (!to->parents)
1284 return 1;
1285 if (to->parents->next)
1286 return 0;
1287 to = to->parents->item;
1288 }
1289 return 1;
1290}
1291
c0efb4c1 1292static int can_fast_forward(struct commit *onto, struct commit *upstream,
4effc5bc 1293 struct commit *restrict_revision,
c0efb4c1 1294 struct object_id *head_oid, struct object_id *merge_base)
9a48a615
PK		 1295{
1296 struct commit *head = lookup_commit(the_repository, head_oid);
2b318aa6
DL		 1297 struct commit_list *merge_bases = NULL;
1298 int res = 0;
9a48a615
PK		 1299
1300 if (!head)
2b318aa6 1301 goto done;
9a48a615
PK		 1302
1303 merge_bases = get_merge_bases(onto, head);
2b318aa6 1304 if (!merge_bases || merge_bases->next) {
9a48a615 1305 oidcpy(merge_base, &null_oid);
2b318aa6 1306 goto done;
9a48a615 1307 }
2b318aa6
DL		 1308
1309 oidcpy(merge_base, &merge_bases->item->object.oid);
1310 if (!oideq(merge_base, &onto->object.oid))
1311 goto done;
1312
4effc5bc
DL		 1313 if (restrict_revision && !oideq(&restrict_revision->object.oid, merge_base))
1314 goto done;
1315
c0efb4c1
DL		 1316 if (!upstream)
1317 goto done;
1318
1319 free_commit_list(merge_bases);
1320 merge_bases = get_merge_bases(upstream, head);
1321 if (!merge_bases || merge_bases->next)
1322 goto done;
1323
1324 if (!oideq(&onto->object.oid, &merge_bases->item->object.oid))
1325 goto done;
1326
2b318aa6
DL		 1327 res = 1;
1328
1329done:
9a48a615
PK		 1330 free_commit_list(merge_bases);
1331 return res && is_linear_history(onto, head);
1332}
1333
52eb738d
EN		 1334static int parse_opt_am(const struct option *opt, const char *arg, int unset)
1335{
1336 struct rebase_options *opts = opt->value;
1337
1338 BUG_ON_OPT_NEG(unset);
1339 BUG_ON_OPT_ARG(arg);
1340
10cdb9f3 1341 opts->type = REBASE_APPLY;
52eb738d
EN		 1342
1343 return 0;
1344}
1345
361badd3
PK		 1346/* -i followed by -m is still -i */
1347static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
1348{
1349 struct rebase_options *opts = opt->value;
1350
517fe807
JK		 1351 BUG_ON_OPT_NEG(unset);
1352 BUG_ON_OPT_ARG(arg);
1353
10cdb9f3 1354 if (!is_merge(opts))
361badd3
PK		 1355 opts->type = REBASE_MERGE;
1356
1357 return 0;
1358}
1359
1360/* -i followed by -p is still explicitly interactive, but -p alone is not */
1361static int parse_opt_interactive(const struct option *opt, const char *arg,
1362 int unset)
1363{
1364 struct rebase_options *opts = opt->value;
1365
517fe807
JK		 1366 BUG_ON_OPT_NEG(unset);
1367 BUG_ON_OPT_ARG(arg);
1368
10cdb9f3 1369 opts->type = REBASE_MERGE;
361badd3
PK		 1370 opts->flags |= REBASE_INTERACTIVE_EXPLICIT;
1371
1372 return 0;
1373}
1374
e98c4269
EN		 1375static enum empty_type parse_empty_value(const char *value)
1376{
1377 if (!strcasecmp(value, "drop"))
1378 return EMPTY_DROP;
1379 else if (!strcasecmp(value, "keep"))
1380 return EMPTY_KEEP;
1381 else if (!strcasecmp(value, "ask"))
1382 return EMPTY_ASK;
1383
1384 die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value);
1385}
1386
1387static int parse_opt_empty(const struct option *opt, const char *arg, int unset)
1388{
1389 struct rebase_options *options = opt->value;
1390 enum empty_type value = parse_empty_value(arg);
1391
1392 BUG_ON_OPT_NEG(unset);
1393
1394 options->empty = value;
1395 return 0;
1396}
1397
8f5986d9
PK		 1398static void NORETURN error_on_missing_default_upstream(void)
1399{
1400 struct branch *current_branch = branch_get(NULL);
1401
1402 printf(_("%s\n"
1403 "Please specify which branch you want to rebase against.\n"
1404 "See git-rebase(1) for details.\n"
1405 "\n"
1406 " git rebase '<branch>'\n"
1407 "\n"),
1408 current_branch ? _("There is no tracking information for "
1409 "the current branch.") :
1410 _("You are not currently on a branch."));
1411
1412 if (current_branch) {
1413 const char *remote = current_branch->remote_name;
1414
1415 if (!remote)
1416 remote = _("<remote>");
1417
1418 printf(_("If you wish to set tracking information for this "
1419 "branch you can do so with:\n"
1420 "\n"
1421 " git branch --set-upstream-to=%s/<branch> %s\n"
1422 "\n"),
1423 remote, current_branch->name);
1424 }
1425 exit(1);
1426}
1427
13a5a9f0
JS		 1428static void set_reflog_action(struct rebase_options *options)
1429{
1430 const char *env;
1431 struct strbuf buf = STRBUF_INIT;
1432
10cdb9f3 1433 if (!is_merge(options))
13a5a9f0
JS		 1434 return;
1435
1436 env = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
1437 if (env && strcmp("rebase", env))
1438 return; /* only override it if it is "rebase" */
1439
c2417d3a 1440 strbuf_addf(&buf, "rebase (%s)", options->action);
13a5a9f0
JS		 1441 setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1);
1442 strbuf_release(&buf);
1443}
1444
c762aada
PW		 1445static int check_exec_cmd(const char *cmd)
1446{
1447 if (strchr(cmd, '\n'))
1448 return error(_("exec commands cannot contain newlines"));
1449
1450 /* Does the command consist purely of whitespace? */
1451 if (!cmd[strspn(cmd, " \t\r\f\v")])
1452 return error(_("empty exec command"));
1453
1454 return 0;
1455}
1456
1457
55071ea2
PK		 1458int cmd_rebase(int argc, const char **argv, const char *prefix)
1459{
73fdc535 1460 struct rebase_options options = REBASE_OPTIONS_INIT;
ac7f467f 1461 const char *branch_name;
f9573628 1462 int ret, flags, total_argc, in_progress = 0;
414d924b 1463 int keep_base = 0;
06e4775a 1464 int ok_to_skip_pre_rebase = 0;
ac7f467f
PK		 1465 struct strbuf msg = STRBUF_INIT;
1466 struct strbuf revisions = STRBUF_INIT;
c54dacb5 1467 struct strbuf buf = STRBUF_INIT;
075bc852 1468 struct object_id merge_base;
297b1e17 1469 enum action action = ACTION_NONE;
12026a41 1470 const char *gpg_sign = NULL;
68e46d78 1471 struct string_list exec = STRING_LIST_INIT_NODUP;
3c3588c7 1472 const char *rebase_merges = NULL;
92d0d74e 1473 int fork_point = -1;
ba1905a5 1474 struct string_list strategy_options = STRING_LIST_INIT_NODUP;
9dba809a
PK		 1475 struct object_id squash_onto;
1476 char *squash_onto_name = NULL;
906b6394 1477 int reschedule_failed_exec = -1;
befb89ce 1478 int allow_preemptive_ff = 1;
f28d40d3
PK		 1479 struct option builtin_rebase_options[] = {
1480 OPT_STRING(0, "onto", &options.onto_name,
1481 N_("revision"),
1482 N_("rebase onto given branch instead of upstream")),
414d924b
DL		 1483 OPT_BOOL(0, "keep-base", &keep_base,
1484 N_("use the merge-base of upstream and branch as the current base")),
06e4775a
PK		 1485 OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase,
1486 N_("allow pre-rebase hook to run")),
b4c8eb02
PK		 1487 OPT_NEGBIT('q', "quiet", &options.flags,
1488 N_("be quiet. implies --no-stat"),
55d2b6d7 1489 REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
bff014da
PK		 1490 OPT_BIT('v', "verbose", &options.flags,
1491 N_("display a diffstat of what changed upstream"),
1492 REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
1493 {OPTION_NEGBIT, 'n', "no-stat", &options.flags, NULL,
1494 N_("do not show diffstat of what changed upstream"),
1495 PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
73d51ed0
PK		 1496 OPT_BOOL(0, "signoff", &options.signoff,
1497 N_("add a Signed-off-by: line to each commit")),
4d924528
JH		 1498 OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts,
1499 NULL, N_("passed to 'git am'"),
1500 PARSE_OPT_NOARG),
1501 OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
1502 &options.git_am_opts, NULL,
1503 N_("passed to 'git am'"), PARSE_OPT_NOARG),
1504 OPT_PASSTHRU_ARGV(0, "ignore-date", &options.git_am_opts, NULL,
1505 N_("passed to 'git am'"), PARSE_OPT_NOARG),
f5769680
JS		 1506 OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
1507 N_("passed to 'git apply'"), 0),
1508 OPT_PASSTHRU_ARGV(0, "whitespace", &options.git_am_opts,
1509 N_("action"), N_("passed to 'git apply'"), 0),
1ed9c14f
PK		 1510 OPT_BIT('f', "force-rebase", &options.flags,
1511 N_("cherry-pick all commits, even if unchanged"),
1512 REBASE_FORCE),
1513 OPT_BIT(0, "no-ff", &options.flags,
1514 N_("cherry-pick all commits, even if unchanged"),
1515 REBASE_FORCE),
f9573628
PK		 1516 OPT_CMDMODE(0, "continue", &action, N_("continue"),
1517 ACTION_CONTINUE),
122420c2
PK		 1518 OPT_CMDMODE(0, "skip", &action,
1519 N_("skip current patch and continue"), ACTION_SKIP),
5e5d9619
PK		 1520 OPT_CMDMODE(0, "abort", &action,
1521 N_("abort and check out the original branch"),
1522 ACTION_ABORT),
5a614945
PK		 1523 OPT_CMDMODE(0, "quit", &action,
1524 N_("abort but keep HEAD where it is"), ACTION_QUIT),
51e9ea6d
PK		 1525 OPT_CMDMODE(0, "edit-todo", &action, N_("edit the todo list "
1526 "during an interactive rebase"), ACTION_EDIT_TODO),
1527 OPT_CMDMODE(0, "show-current-patch", &action,
1528 N_("show the patch file being applied or merged"),
1529 ACTION_SHOW_CURRENT_PATCH),
10cdb9f3
EN		 1530 { OPTION_CALLBACK, 0, "apply", &options, NULL,
1531 N_("use apply strategies to rebase"),
52eb738d
EN		 1532 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1533 parse_opt_am },
361badd3
PK		 1534 { OPTION_CALLBACK, 'm', "merge", &options, NULL,
1535 N_("use merging strategies to rebase"),
1536 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1537 parse_opt_merge },
1538 { OPTION_CALLBACK, 'i', "interactive", &options, NULL,
1539 N_("let the user edit the list of commits to rebase"),
1540 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1541 parse_opt_interactive },
feebd2d2
DL		 1542 OPT_SET_INT_F('p', "preserve-merges", &options.type,
1543 N_("(DEPRECATED) try to recreate merges instead of "
1544 "ignoring them"),
1545 REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
6023c928 1546 OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
937d1436 1547 OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
e98c4269
EN		 1548 N_("how to handle commits that become empty"),
1549 PARSE_OPT_NONEG, parse_opt_empty),
d48e5e21
EN		 1550 { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
1551 N_("(DEPRECATED) keep empty commits"),
1552 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
1553 parse_opt_keep_empty },
051910a9
PK		 1554 OPT_BOOL(0, "autosquash", &options.autosquash,
1555 N_("move commits that begin with "
1556 "squash!/fixup! under -i")),
12026a41
PK		 1557 { OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
1558 N_("GPG-sign commits"),
1559 PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
6defce2b
PK		 1560 OPT_BOOL(0, "autostash", &options.autostash,
1561 N_("automatically stash/stash pop before and after")),
68e46d78
PK		 1562 OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
1563 N_("add exec lines after each commit of the "
1564 "editable list")),
22a69fda
EN		 1565 OPT_BOOL_F(0, "allow-empty-message",
1566 &options.allow_empty_message,
1567 N_("allow rebasing commits with empty messages"),
1568 PARSE_OPT_HIDDEN),
3c3588c7
PK		 1569 {OPTION_STRING, 'r', "rebase-merges", &rebase_merges,
1570 N_("mode"),
1571 N_("try to rebase merges instead of skipping them"),
1572 PARSE_OPT_OPTARG, NULL, (intptr_t)""},
92d0d74e
PK		 1573 OPT_BOOL(0, "fork-point", &fork_point,
1574 N_("use 'merge-base --fork-point' to refine upstream")),
ba1905a5
PK		 1575 OPT_STRING('s', "strategy", &options.strategy,
1576 N_("strategy"), N_("use the given merge strategy")),
1577 OPT_STRING_LIST('X', "strategy-option", &strategy_options,
1578 N_("option"),
1579 N_("pass the argument through to the merge "
1580 "strategy")),
9dba809a
PK		 1581 OPT_BOOL(0, "root", &options.root,
1582 N_("rebase all reachable commits up to the root(s)")),
d421afa0 1583 OPT_BOOL(0, "reschedule-failed-exec",
906b6394 1584 &reschedule_failed_exec,
d421afa0 1585 N_("automatically re-schedule any `exec` that fails")),
f28d40d3
PK		 1586 OPT_END(),
1587 };
f5769680 1588 int i;
ac7f467f 1589
f28d40d3
PK		 1590 if (argc == 2 && !strcmp(argv[1], "-h"))
1591 usage_with_options(builtin_rebase_usage,
1592 builtin_rebase_options);
1593
73fdc535 1594 options.allow_empty_message = 1;
bff014da
PK		 1595 git_config(rebase_config, &options);
1596
d03ebd41
ÆAB		 1597 if (options.use_legacy_rebase ||
1598 !git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1))
1599 warning(_("the rebase.useBuiltin support has been removed!\n"
1600 "See its entry in 'git help config' for details."));
1601
0eabf4b9
PK		 1602 strbuf_reset(&buf);
1603 strbuf_addf(&buf, "%s/applying", apply_dir());
1604 if(file_exists(buf.buf))
1605 die(_("It looks like 'git am' is in progress. Cannot rebase."));
1606
c54dacb5 1607 if (is_directory(apply_dir())) {
10cdb9f3 1608 options.type = REBASE_APPLY;
c54dacb5
PK		 1609 options.state_dir = apply_dir();
1610 } else if (is_directory(merge_dir())) {
1611 strbuf_reset(&buf);
1612 strbuf_addf(&buf, "%s/rewritten", merge_dir());
1613 if (is_directory(buf.buf)) {
1614 options.type = REBASE_PRESERVE_MERGES;
1615 options.flags |= REBASE_INTERACTIVE_EXPLICIT;
1616 } else {
1617 strbuf_reset(&buf);
1618 strbuf_addf(&buf, "%s/interactive", merge_dir());
1619 if(file_exists(buf.buf)) {
10cdb9f3 1620 options.type = REBASE_MERGE;
c54dacb5
PK		 1621 options.flags |= REBASE_INTERACTIVE_EXPLICIT;
1622 } else
1623 options.type = REBASE_MERGE;
1624 }
1625 options.state_dir = merge_dir();
1626 }
1627
1628 if (options.type != REBASE_UNSPECIFIED)
1629 in_progress = 1;
1630
f9573628 1631 total_argc = argc;
f28d40d3
PK		 1632 argc = parse_options(argc, argv, prefix,
1633 builtin_rebase_options,
1634 builtin_rebase_usage, 0);
1635
297b1e17 1636 if (action != ACTION_NONE && total_argc != 2) {
f9573628
PK		 1637 usage_with_options(builtin_rebase_usage,
1638 builtin_rebase_options);
1639 }
1640
f28d40d3
PK		 1641 if (argc > 2)
1642 usage_with_options(builtin_rebase_usage,
1643 builtin_rebase_options);
ac7f467f 1644
427c3bd2
JS		 1645 if (options.type == REBASE_PRESERVE_MERGES)
1646 warning(_("git rebase --preserve-merges is deprecated. "
1647 "Use --rebase-merges instead."));
1648
414d924b
DL		 1649 if (keep_base) {
1650 if (options.onto_name)
1651 die(_("cannot combine '--keep-base' with '--onto'"));
1652 if (options.root)
1653 die(_("cannot combine '--keep-base' with '--root'"));
1654 }
1655
297b1e17 1656 if (action != ACTION_NONE && !in_progress)
d732a570 1657 die(_("No rebase in progress?"));
13a5a9f0 1658 setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
d732a570 1659
10cdb9f3 1660 if (action == ACTION_EDIT_TODO && !is_merge(&options))
51e9ea6d
PK		 1661 die(_("The --edit-todo action can only be used during "
1662 "interactive rebase."));
1663
b3a5d5a8 1664 if (trace2_is_enabled()) {
10cdb9f3 1665 if (is_merge(&options))
b3a5d5a8
JH		 1666 trace2_cmd_mode("interactive");
1667 else if (exec.nr)
1668 trace2_cmd_mode("interactive-exec");
1669 else
1670 trace2_cmd_mode(action_names[action]);
1671 }
1672
f9573628
PK		 1673 switch (action) {
1674 case ACTION_CONTINUE: {
1675 struct object_id head;
1676 struct lock_file lock_file = LOCK_INIT;
1677 int fd;
1678
1679 options.action = "continue";
13a5a9f0 1680 set_reflog_action(&options);
f9573628
PK		 1681
1682 /* Sanity check */
1683 if (get_oid("HEAD", &head))
1684 die(_("Cannot read HEAD"));
1685
1686 fd = hold_locked_index(&lock_file, 0);
e1ff0a32 1687 if (repo_read_index(the_repository) < 0)
f9573628
PK		 1688 die(_("could not read index"));
1689 refresh_index(the_repository->index, REFRESH_QUIET, NULL, NULL,
1690 NULL);
1691 if (0 <= fd)
1b0d968b 1692 repo_update_index_if_able(the_repository, &lock_file);
f9573628
PK		 1693 rollback_lock_file(&lock_file);
1694
5b02ca38 1695 if (has_unstaged_changes(the_repository, 1)) {
f9573628
PK		 1696 puts(_("You must edit all merge conflicts and then\n"
1697 "mark them as resolved using git add"));
1698 exit(1);
1699 }
1700 if (read_basic_state(&options))
1701 exit(1);
1702 goto run_rebase;
1703 }
122420c2
PK		 1704 case ACTION_SKIP: {
1705 struct string_list merge_rr = STRING_LIST_INIT_DUP;
1706
1707 options.action = "skip";
13a5a9f0 1708 set_reflog_action(&options);
122420c2 1709
55e6b354 1710 rerere_clear(the_repository, &merge_rr);
122420c2
PK		 1711 string_list_clear(&merge_rr, 1);
1712
bac2a1e3
JS		 1713 if (reset_head(NULL, "reset", NULL, RESET_HEAD_HARD,
1714 NULL, NULL) < 0)
122420c2 1715 die(_("could not discard worktree changes"));
f4a4b9ac 1716 remove_branch_state(the_repository, 0);
122420c2
PK		 1717 if (read_basic_state(&options))
1718 exit(1);
1719 goto run_rebase;
1720 }
5e5d9619
PK		 1721 case ACTION_ABORT: {
1722 struct string_list merge_rr = STRING_LIST_INIT_DUP;
1723 options.action = "abort";
13a5a9f0 1724 set_reflog_action(&options);
5e5d9619 1725
55e6b354 1726 rerere_clear(the_repository, &merge_rr);
5e5d9619
PK		 1727 string_list_clear(&merge_rr, 1);
1728
1729 if (read_basic_state(&options))
1730 exit(1);
1731 if (reset_head(&options.orig_head, "reset",
bac2a1e3
JS		 1732 options.head_name, RESET_HEAD_HARD,
1733 NULL, NULL) < 0)
5e5d9619
PK		 1734 die(_("could not move back to %s"),
1735 oid_to_hex(&options.orig_head));
f4a4b9ac 1736 remove_branch_state(the_repository, 0);
d3fce47d 1737 ret = !!finish_rebase(&options);
5e5d9619
PK		 1738 goto cleanup;
1739 }
5a614945 1740 case ACTION_QUIT: {
10cdb9f3 1741 if (options.type == REBASE_MERGE) {
d559f502
PW		 1742 struct replay_opts replay = REPLAY_OPTS_INIT;
1743
1744 replay.action = REPLAY_INTERACTIVE_REBASE;
1745 ret = !!sequencer_remove_state(&replay);
1746 } else {
1747 strbuf_reset(&buf);
1748 strbuf_addstr(&buf, options.state_dir);
1749 ret = !!remove_dir_recursively(&buf, 0);
1750 if (ret)
1751 error(_("could not remove '%s'"),
1752 options.state_dir);
1753 }
5a614945
PK		 1754 goto cleanup;
1755 }
51e9ea6d
PK		 1756 case ACTION_EDIT_TODO:
1757 options.action = "edit-todo";
1758 options.dont_finish_rebase = 1;
1759 goto run_rebase;
1760 case ACTION_SHOW_CURRENT_PATCH:
1761 options.action = "show-current-patch";
1762 options.dont_finish_rebase = 1;
1763 goto run_rebase;
297b1e17 1764 case ACTION_NONE:
51e9ea6d 1765 break;
f9573628 1766 default:
51e9ea6d 1767 BUG("action: %d", action);
f9573628
PK		 1768 }
1769
c54dacb5
PK		 1770 /* Make sure no rebase is in progress */
1771 if (in_progress) {
1772 const char *last_slash = strrchr(options.state_dir, '/');
1773 const char *state_dir_base =
1774 last_slash ? last_slash + 1 : options.state_dir;
1775 const char *cmd_live_rebase =
1776 "git rebase (--continue | --abort | --skip)";
1777 strbuf_reset(&buf);
1778 strbuf_addf(&buf, "rm -fr \"%s\"", options.state_dir);
1779 die(_("It seems that there is already a %s directory, and\n"
1780 "I wonder if you are in the middle of another rebase. "
1781 "If that is the\n"
1782 "case, please try\n\t%s\n"
1783 "If that is not the case, please\n\t%s\n"
1784 "and run me again. I am stopping in case you still "
1785 "have something\n"
1786 "valuable there.\n"),
1787 state_dir_base, cmd_live_rebase, buf.buf);
1788 }
1789
befb89ce
EN		 1790 if ((options.flags & REBASE_INTERACTIVE_EXPLICIT) ||
1791 (action != ACTION_NONE) ||
1792 (exec.nr > 0) ||
1793 options.autosquash) {
1794 allow_preemptive_ff = 0;
1795 }
1796
f5769680 1797 for (i = 0; i < options.git_am_opts.argc; i++) {
04519d72 1798 const char *option = options.git_am_opts.argv[i], *p;
4d924528
JH		 1799 if (!strcmp(option, "--committer-date-is-author-date") ||
1800 !strcmp(option, "--ignore-date") ||
1801 !strcmp(option, "--whitespace=fix") ||
f5769680 1802 !strcmp(option, "--whitespace=strip"))
befb89ce 1803 allow_preemptive_ff = 0;
04519d72
JS		 1804 else if (skip_prefix(option, "-C", &p)) {
1805 while (*p)
1806 if (!isdigit(*(p++)))
1807 die(_("switch `C' expects a "
1808 "numerical value"));
1809 } else if (skip_prefix(option, "--whitespace=", &p)) {
1810 if (*p && strcmp(p, "warn") && strcmp(p, "nowarn") &&
1811 strcmp(p, "error") && strcmp(p, "error-all"))
1812 die("Invalid whitespace option: '%s'", p);
1813 }
38dbcef2
PK		 1814 }
1815
c762aada
PW		 1816 for (i = 0; i < exec.nr; i++)
1817 if (check_exec_cmd(exec.items[i].string))
1818 exit(1);
1819
f5769680
JS		 1820 if (!(options.flags & REBASE_NO_QUIET))
1821 argv_array_push(&options.git_am_opts, "-q");
53f9e5be 1822
e98c4269 1823 if (options.empty != EMPTY_UNSPECIFIED)
10cdb9f3 1824 imply_merge(&options, "--empty");
002ee2fe 1825
12026a41
PK		 1826 if (gpg_sign) {
1827 free(options.gpg_sign_opt);
1828 options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
1829 }
1830
68e46d78
PK		 1831 if (exec.nr) {
1832 int i;
1833
10cdb9f3 1834 imply_merge(&options, "--exec");
68e46d78
PK		 1835
1836 strbuf_reset(&buf);
1837 for (i = 0; i < exec.nr; i++)
1838 strbuf_addf(&buf, "exec %s\n", exec.items[i].string);
1839 options.cmd = xstrdup(buf.buf);
1840 }
1841
3c3588c7
PK		 1842 if (rebase_merges) {
1843 if (!*rebase_merges)
1844 ; /* default mode; do nothing */
1845 else if (!strcmp("rebase-cousins", rebase_merges))
1846 options.rebase_cousins = 1;
1847 else if (strcmp("no-rebase-cousins", rebase_merges))
1848 die(_("Unknown mode: %s"), rebase_merges);
1849 options.rebase_merges = 1;
10cdb9f3 1850 imply_merge(&options, "--rebase-merges");
3c3588c7
PK		 1851 }
1852
ba1905a5
PK		 1853 if (strategy_options.nr) {
1854 int i;
1855
1856 if (!options.strategy)
1857 options.strategy = "recursive";
1858
1859 strbuf_reset(&buf);
1860 for (i = 0; i < strategy_options.nr; i++)
1861 strbuf_addf(&buf, " --%s",
1862 strategy_options.items[i].string);
1863 options.strategy_opts = xstrdup(buf.buf);
1864 }
1865
1866 if (options.strategy) {
1867 options.strategy = xstrdup(options.strategy);
1868 switch (options.type) {
10cdb9f3 1869 case REBASE_APPLY:
ba1905a5
PK		 1870 die(_("--strategy requires --merge or --interactive"));
1871 case REBASE_MERGE:
ba1905a5
PK		 1872 case REBASE_PRESERVE_MERGES:
1873 /* compatible */
1874 break;
1875 case REBASE_UNSPECIFIED:
1876 options.type = REBASE_MERGE;
1877 break;
1878 default:
1879 BUG("unhandled rebase type (%d)", options.type);
1880 }
1881 }
1882
68aa495b 1883 if (options.type == REBASE_MERGE)
10cdb9f3 1884 imply_merge(&options, "--merge");
68aa495b 1885
9dba809a 1886 if (options.root && !options.onto_name)
10cdb9f3 1887 imply_merge(&options, "--root without --onto");
9dba809a 1888
cda614e4
PK		 1889 if (isatty(2) && options.flags & REBASE_NO_QUIET)
1890 strbuf_addstr(&options.git_format_patch_opt, " --progress");
1891
10cdb9f3
EN		 1892 if (options.git_am_opts.argc || options.type == REBASE_APPLY) {
1893 /* all am options except -q are compatible only with --apply */
8af14f08
EN		 1894 for (i = options.git_am_opts.argc - 1; i >= 0; i--)
1895 if (strcmp(options.git_am_opts.argv[i], "-q"))
1896 break;
1897
8295ed69 1898 if (i >= 0) {
10cdb9f3
EN		 1899 if (is_merge(&options))
1900 die(_("cannot combine apply options with "
1901 "merge options"));
8295ed69 1902 else
10cdb9f3 1903 options.type = REBASE_APPLY;
8295ed69
EN		 1904 }
1905 }
1906
1907 if (options.type == REBASE_UNSPECIFIED) {
1908 if (!strcmp(options.default_backend, "merge"))
10cdb9f3
EN		 1909 imply_merge(&options, "--merge");
1910 else if (!strcmp(options.default_backend, "apply"))
1911 options.type = REBASE_APPLY;
8295ed69
EN		 1912 else
1913 die(_("Unknown rebase backend: %s"),
1914 options.default_backend);
8af14f08
EN		 1915 }
1916
ac7f467f
PK		 1917 switch (options.type) {
1918 case REBASE_MERGE:
ac7f467f
PK		 1919 case REBASE_PRESERVE_MERGES:
1920 options.state_dir = merge_dir();
1921 break;
10cdb9f3 1922 case REBASE_APPLY:
ac7f467f
PK		 1923 options.state_dir = apply_dir();
1924 break;
1925 default:
8295ed69 1926 BUG("options.type was just set above; should be unreachable.");
ac7f467f
PK		 1927 }
1928
e98c4269
EN		 1929 if (options.empty == EMPTY_UNSPECIFIED) {
1930 if (options.flags & REBASE_INTERACTIVE_EXPLICIT)
1931 options.empty = EMPTY_ASK;
1932 else if (exec.nr > 0)
1933 options.empty = EMPTY_KEEP;
1934 else
1935 options.empty = EMPTY_DROP;
1936 }
10cdb9f3 1937 if (reschedule_failed_exec > 0 && !is_merge(&options))
906b6394
JS		 1938 die(_("--reschedule-failed-exec requires "
1939 "--exec or --interactive"));
1940 if (reschedule_failed_exec >= 0)
1941 options.reschedule_failed_exec = reschedule_failed_exec;
d421afa0 1942
73d51ed0
PK		 1943 if (options.signoff) {
1944 if (options.type == REBASE_PRESERVE_MERGES)
1945 die("cannot combine '--signoff' with "
1946 "'--preserve-merges'");
f5769680 1947 argv_array_push(&options.git_am_opts, "--signoff");
73d51ed0
PK		 1948 options.flags |= REBASE_FORCE;
1949 }
1950
d421afa0 1951 if (options.type == REBASE_PRESERVE_MERGES) {
b361bd75
PK		 1952 /*
1953 * Note: incompatibility with --signoff handled in signoff block above
1954 * Note: incompatibility with --interactive is just a strong warning;
1955 * git-rebase.txt caveats with "unless you know what you are doing"
1956 */
1957 if (options.rebase_merges)
c913c596 1958 die(_("cannot combine '--preserve-merges' with "
b361bd75
PK		 1959 "'--rebase-merges'"));
1960
d421afa0
JS		 1961 if (options.reschedule_failed_exec)
1962 die(_("error: cannot combine '--preserve-merges' with "
1963 "'--reschedule-failed-exec'"));
1964 }
1965
ac7f467f 1966 if (!options.root) {
8f5986d9
PK		 1967 if (argc < 1) {
1968 struct branch *branch;
1969
1970 branch = branch_get(NULL);
1971 options.upstream_name = branch_get_upstream(branch,
1972 NULL);
1973 if (!options.upstream_name)
1974 error_on_missing_default_upstream();
1975 if (fork_point < 0)
1976 fork_point = 1;
1977 } else {
f28d40d3 1978 options.upstream_name = argv[0];
ac7f467f
PK		 1979 argc--;
1980 argv++;
1981 if (!strcmp(options.upstream_name, "-"))
1982 options.upstream_name = "@{-1}";
1983 }
1984 options.upstream = peel_committish(options.upstream_name);
1985 if (!options.upstream)
1986 die(_("invalid upstream '%s'"), options.upstream_name);
06e4775a 1987 options.upstream_arg = options.upstream_name;
9dba809a
PK		 1988 } else {
1989 if (!options.onto_name) {
1990 if (commit_tree("", 0, the_hash_algo->empty_tree, NULL,
1991 &squash_onto, NULL, NULL) < 0)
1992 die(_("Could not create new root commit"));
1993 options.squash_onto = &squash_onto;
1994 options.onto_name = squash_onto_name =
1995 xstrdup(oid_to_hex(&squash_onto));
e1fac531
JS		 1996 } else
1997 options.root_with_onto = 1;
1998
9dba809a
PK		 1999 options.upstream_name = NULL;
2000 options.upstream = NULL;
2001 if (argc > 1)
2002 usage_with_options(builtin_rebase_usage,
2003 builtin_rebase_options);
2004 options.upstream_arg = "--root";
2005 }
ac7f467f
PK		 2006
2007 /* Make sure the branch to rebase onto is valid. */
414d924b
DL		 2008 if (keep_base) {
2009 strbuf_reset(&buf);
2010 strbuf_addstr(&buf, options.upstream_name);
2011 strbuf_addstr(&buf, "...");
2012 options.onto_name = xstrdup(buf.buf);
2013 } else if (!options.onto_name)
ac7f467f
PK		 2014 options.onto_name = options.upstream_name;
2015 if (strstr(options.onto_name, "...")) {
414d924b
DL		 2016 if (get_oid_mb(options.onto_name, &merge_base) < 0) {
2017 if (keep_base)
2018 die(_("'%s': need exactly one merge base with branch"),
2019 options.upstream_name);
2020 else
2021 die(_("'%s': need exactly one merge base"),
2022 options.onto_name);
2023 }
075bc852
PK		 2024 options.onto = lookup_commit_or_die(&merge_base,
2025 options.onto_name);
ac7f467f
PK		 2026 } else {
2027 options.onto = peel_committish(options.onto_name);
2028 if (!options.onto)
2029 die(_("Does not point to a valid commit '%s'"),
2030 options.onto_name);
2031 }
2032
2033 /*
2034 * If the branch to rebase is given, that is the branch we will rebase
2035 * branch_name -- branch/commit being rebased, or
2036 * HEAD (already detached)
2037 * orig_head -- commit object name of tip of the branch before rebasing
d4c569f8 2038 * head_name -- refs/heads/<that-branch> or NULL (detached HEAD)
ac7f467f 2039 */
e65123a7
PK		 2040 if (argc == 1) {
2041 /* Is it "rebase other branchname" or "rebase other commit"? */
2042 branch_name = argv[0];
2043 options.switch_to = argv[0];
2044
2045 /* Is it a local branch? */
2046 strbuf_reset(&buf);
2047 strbuf_addf(&buf, "refs/heads/%s", branch_name);
b5cabb4a
ES		 2048 if (!read_ref(buf.buf, &options.orig_head)) {
2049 die_if_checked_out(buf.buf, 1);
e65123a7
PK		 2050 options.head_name = xstrdup(buf.buf);
2051 /* If not is it a valid ref (branch or commit)? */
b5cabb4a 2052 } else if (!get_oid(branch_name, &options.orig_head))
e65123a7
PK		 2053 options.head_name = NULL;
2054 else
2055 die(_("fatal: no such branch/commit '%s'"),
2056 branch_name);
2057 } else if (argc == 0) {
ac7f467f
PK		 2058 /* Do not need to switch branches, we are already on it. */
2059 options.head_name =
2060 xstrdup_or_null(resolve_ref_unsafe("HEAD", 0, NULL,
2061 &flags));
2062 if (!options.head_name)
2063 die(_("No such ref: %s"), "HEAD");
2064 if (flags & REF_ISSYMREF) {
2065 if (!skip_prefix(options.head_name,
2066 "refs/heads/", &branch_name))
2067 branch_name = options.head_name;
2068
2069 } else {
7762f44e 2070 FREE_AND_NULL(options.head_name);
ac7f467f
PK		 2071 branch_name = "HEAD";
2072 }
2073 if (get_oid("HEAD", &options.orig_head))
2074 die(_("Could not resolve HEAD to a revision"));
e65123a7
PK		 2075 } else
2076 BUG("unexpected number of arguments left to parse");
ac7f467f 2077
92d0d74e
PK		 2078 if (fork_point > 0) {
2079 struct commit *head =
2080 lookup_commit_reference(the_repository,
2081 &options.orig_head);
2082 options.restrict_revision =
2083 get_fork_point(options.upstream_name, head);
2084 }
2085
e1ff0a32 2086 if (repo_read_index(the_repository) < 0)
e0333e5c
PK		 2087 die(_("could not read index"));
2088
6defce2b
PK		 2089 if (options.autostash) {
2090 struct lock_file lock_file = LOCK_INIT;
2091 int fd;
2092
2093 fd = hold_locked_index(&lock_file, 0);
2094 refresh_cache(REFRESH_QUIET);
2095 if (0 <= fd)
1b0d968b 2096 repo_update_index_if_able(the_repository, &lock_file);
6defce2b
PK		 2097 rollback_lock_file(&lock_file);
2098
5b02ca38
NTND		 2099 if (has_unstaged_changes(the_repository, 1) ||
2100 has_uncommitted_changes(the_repository, 1)) {
6defce2b
PK		 2101 const char *autostash =
2102 state_dir_path("autostash", &options);
2103 struct child_process stash = CHILD_PROCESS_INIT;
2104 struct object_id oid;
6defce2b
PK		 2105
2106 argv_array_pushl(&stash.args,
2107 "stash", "create", "autostash", NULL);
2108 stash.git_cmd = 1;
2109 stash.no_stdin = 1;
2110 strbuf_reset(&buf);
2111 if (capture_command(&stash, &buf, GIT_MAX_HEXSZ))
2112 die(_("Cannot autostash"));
2113 strbuf_trim_trailing_newline(&buf);
2114 if (get_oid(buf.buf, &oid))
2115 die(_("Unexpected stash response: '%s'"),
2116 buf.buf);
2117 strbuf_reset(&buf);
2118 strbuf_add_unique_abbrev(&buf, &oid, DEFAULT_ABBREV);
2119
2120 if (safe_create_leading_directories_const(autostash))
2121 die(_("Could not create directory for '%s'"),
2122 options.state_dir);
12aeb00a 2123 write_file(autostash, "%s", oid_to_hex(&oid));
6defce2b 2124 printf(_("Created autostash: %s\n"), buf.buf);
bf1e28e0 2125 if (reset_head(NULL, "reset --hard",
bac2a1e3 2126 NULL, RESET_HEAD_HARD, NULL, NULL) < 0)
6defce2b 2127 die(_("could not reset --hard"));
6defce2b
PK		 2128
2129 if (discard_index(the_repository->index) < 0 ||
e1ff0a32 2130 repo_read_index(the_repository) < 0)
6defce2b
PK		 2131 die(_("could not read index"));
2132 }
2133 }
2134
5b02ca38 2135 if (require_clean_work_tree(the_repository, "rebase",
e0333e5c
PK		 2136 _("Please commit or stash them."), 1, 1)) {
2137 ret = 1;
2138 goto cleanup;
ac7f467f
PK		 2139 }
2140
9a48a615
PK		 2141 /*
2142 * Now we are rebasing commits upstream..orig_head (or with --root,
2143 * everything leading up to orig_head) on top of onto.
2144 */
2145
2146 /*
2147 * Check if we are already based on onto with linear history,
c0efb4c1 2148 * in which case we could fast-forward without replacing the commits
befb89ce
EN		 2149 * with new commits recreated by replaying their changes.
2150 *
2151 * Note that can_fast_forward() initializes merge_base, so we have to
2152 * call it before checking allow_preemptive_ff.
9a48a615 2153 */
4effc5bc
DL		 2154 if (can_fast_forward(options.onto, options.upstream, options.restrict_revision,
2155 &options.orig_head, &merge_base) &&
befb89ce 2156 allow_preemptive_ff) {
9a48a615
PK		 2157 int flag;
2158
1ed9c14f 2159 if (!(options.flags & REBASE_FORCE)) {
e65123a7
PK		 2160 /* Lazily switch to the target branch if needed... */
2161 if (options.switch_to) {
e65123a7 2162 strbuf_reset(&buf);
13a5a9f0
JS		 2163 strbuf_addf(&buf, "%s: checkout %s",
2164 getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
e65123a7 2165 options.switch_to);
240fc04f 2166 if (reset_head(&options.orig_head, "checkout",
8581df65
OS		 2167 options.head_name,
2168 RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
13a5a9f0 2169 NULL, buf.buf) < 0) {
e65123a7
PK		 2170 ret = !!error(_("could not switch to "
2171 "%s"),
2172 options.switch_to);
2173 goto cleanup;
2174 }
2175 }
2176
1ed9c14f
PK		 2177 if (!(options.flags & REBASE_NO_QUIET))
2178 ; /* be quiet */
2179 else if (!strcmp(branch_name, "HEAD") &&
2180 resolve_ref_unsafe("HEAD", 0, NULL, &flag))
2181 puts(_("HEAD is up to date."));
2182 else
2183 printf(_("Current branch %s is up to date.\n"),
2184 branch_name);
2185 ret = !!finish_rebase(&options);
2186 goto cleanup;
2187 } else if (!(options.flags & REBASE_NO_QUIET))
9a48a615
PK		 2188 ; /* be quiet */
2189 else if (!strcmp(branch_name, "HEAD") &&
2190 resolve_ref_unsafe("HEAD", 0, NULL, &flag))
2191 puts(_("HEAD is up to date, rebase forced."));
2192 else
2193 printf(_("Current branch %s is up to date, rebase "
2194 "forced.\n"), branch_name);
2195 }
2196
06e4775a
PK		 2197 /* If a hook exists, give it a chance to interrupt*/
2198 if (!ok_to_skip_pre_rebase &&
2199 run_hook_le(NULL, "pre-rebase", options.upstream_arg,
2200 argc ? argv[0] : NULL, NULL))
2201 die(_("The pre-rebase hook refused to rebase."));
2202
bff014da
PK		 2203 if (options.flags & REBASE_DIFFSTAT) {
2204 struct diff_options opts;
2205
8797f0f0
JS		 2206 if (options.flags & REBASE_VERBOSE) {
2207 if (is_null_oid(&merge_base))
2208 printf(_("Changes to %s:\n"),
2209 oid_to_hex(&options.onto->object.oid));
2210 else
2211 printf(_("Changes from %s to %s:\n"),
2212 oid_to_hex(&merge_base),
2213 oid_to_hex(&options.onto->object.oid));
2214 }
bff014da
PK		 2215
2216 /* We want color (if set), but no pager */
2217 diff_setup(&opts);
2218 opts.stat_width = -1; /* use full terminal width */
2219 opts.stat_graph_width = -1; /* respect statGraphWidth config */
2220 opts.output_format |=
2221 DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
2222 opts.detect_rename = DIFF_DETECT_RENAME;
2223 diff_setup_done(&opts);
8797f0f0
JS		 2224 diff_tree_oid(is_null_oid(&merge_base) ?
2225 the_hash_algo->empty_tree : &merge_base,
2226 &options.onto->object.oid, "", &opts);
bff014da
PK		 2227 diffcore_std(&opts);
2228 diff_flush(&opts);
2229 }
2230
10cdb9f3 2231 if (is_merge(&options))
361badd3
PK		 2232 goto run_rebase;
2233
bff014da
PK		 2234 /* Detach HEAD and reset the tree */
2235 if (options.flags & REBASE_NO_QUIET)
2236 printf(_("First, rewinding head to replay your work on top of "
2237 "it...\n"));
2238
13a5a9f0
JS		 2239 strbuf_addf(&msg, "%s: checkout %s",
2240 getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
73d6d7b2 2241 if (reset_head(&options.onto->object.oid, "checkout", NULL,
cbea6461 2242 RESET_HEAD_DETACH | RESET_ORIG_HEAD |
9fbcc3d2 2243 RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
8581df65 2244 NULL, msg.buf))
ac7f467f
PK		 2245 die(_("Could not detach HEAD"));
2246 strbuf_release(&msg);
2247
7eecfa56
PK		 2248 /*
2249 * If the onto is a proper descendant of the tip of the branch, then
2250 * we just fast-forwarded.
2251 */
2252 strbuf_reset(&msg);
d2c4e629 2253 if (oideq(&merge_base, &options.orig_head)) {
eff199a6 2254 printf(_("Fast-forwarded %s to %s.\n"),
7eecfa56
PK		 2255 branch_name, options.onto_name);
2256 strbuf_addf(&msg, "rebase finished: %s onto %s",
2257 options.head_name ? options.head_name : "detached HEAD",
2258 oid_to_hex(&options.onto->object.oid));
e6aac817
JS		 2259 reset_head(NULL, "Fast-forwarded", options.head_name,
2260 RESET_HEAD_REFS_ONLY, "HEAD", msg.buf);
7eecfa56
PK		 2261 strbuf_release(&msg);
2262 ret = !!finish_rebase(&options);
2263 goto cleanup;
2264 }
2265
ac7f467f
PK		 2266 strbuf_addf(&revisions, "%s..%s",
2267 options.root ? oid_to_hex(&options.onto->object.oid) :
2268 (options.restrict_revision ?
2269 oid_to_hex(&options.restrict_revision->object.oid) :
2270 oid_to_hex(&options.upstream->object.oid)),
2271 oid_to_hex(&options.orig_head));
2272
2273 options.revisions = revisions.buf;
2274
f9573628 2275run_rebase:
460bc3ce 2276 ret = !!run_specific_rebase(&options, action);
ac7f467f 2277
e0333e5c 2278cleanup:
7372eaeb 2279 strbuf_release(&buf);
ac7f467f
PK		 2280 strbuf_release(&revisions);
2281 free(options.head_name);
12026a41 2282 free(options.gpg_sign_opt);
68e46d78 2283 free(options.cmd);
9dba809a 2284 free(squash_onto_name);
ac7f467f 2285 return ret;
55071ea2 2286}
Unnamed repository; edit this file 'description' to name the repository.