git.oblomov.eu Git - git/blob - builtin/rebase.c

   1 /*
   2  * "git rebase" builtin command
   3  *
   4  * Copyright (c) 2018 Pratik Karki
   5  */
   6
   7 #define USE_THE_INDEX_COMPATIBILITY_MACROS
   8 #include "builtin.h"
   9 #include "run-command.h"
  10 #include "exec-cmd.h"
  11 #include "argv-array.h"
  12 #include "dir.h"
  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"
  20 #include "parse-options.h"
  21 #include "commit.h"
  22 #include "diff.h"
  23 #include "wt-status.h"
  24 #include "revision.h"
  25 #include "commit-reach.h"
  26 #include "rerere.h"
  27 #include "branch.h"
  28 #include "sequencer.h"
  29 #include "rebase-interactive.h"
  30
  31 static char const * const builtin_rebase_usage[] = {
  32         N_("git rebase [-i] [options] [--exec <cmd>] "
  33                 "[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"),
  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 };
  39
  40 static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto")
  41 static GIT_PATH_FUNC(path_interactive, "rebase-merge/interactive")
  42 static GIT_PATH_FUNC(apply_dir, "rebase-apply")
  43 static GIT_PATH_FUNC(merge_dir, "rebase-merge")
  44
  45 enum rebase_type {
  46         REBASE_UNSPECIFIED = -1,
  47         REBASE_APPLY,
  48         REBASE_MERGE,
  49         REBASE_PRESERVE_MERGES
  50 };
  51
  52 enum empty_type {
  53         EMPTY_UNSPECIFIED = -1,
  54         EMPTY_DROP,
  55         EMPTY_KEEP,
  56         EMPTY_ASK
  57 };
  58
  59 struct rebase_options {
  60         enum rebase_type type;
  61         enum empty_type empty;
  62         const char *default_backend;
  63         const char *state_dir;
  64         struct commit *upstream;
  65         const char *upstream_name;
  66         const char *upstream_arg;
  67         char *head_name;
  68         struct object_id orig_head;
  69         struct commit *onto;
  70         const char *onto_name;
  71         const char *revisions;
  72         const char *switch_to;
  73         int root, root_with_onto;
  74         struct object_id *squash_onto;
  75         struct commit *restrict_revision;
  76         int dont_finish_rebase;
  77         enum {
  78                 REBASE_NO_QUIET = 1<<0,
  79                 REBASE_VERBOSE = 1<<1,
  80                 REBASE_DIFFSTAT = 1<<2,
  81                 REBASE_FORCE = 1<<3,
  82                 REBASE_INTERACTIVE_EXPLICIT = 1<<4,
  83         } flags;
  84         struct argv_array git_am_opts;
  85         const char *action;
  86         int signoff;
  87         int allow_rerere_autoupdate;
  88         int autosquash;
  89         char *gpg_sign_opt;
  90         int autostash;
  91         char *cmd;
  92         int allow_empty_message;
  93         int rebase_merges, rebase_cousins;
  94         char *strategy, *strategy_opts;
  95         struct strbuf git_format_patch_opt;
  96         int reschedule_failed_exec;
  97         int use_legacy_rebase;
  98 };
  99
 100 #define REBASE_OPTIONS_INIT {                           \
 101                 .type = REBASE_UNSPECIFIED,             \
 102                 .empty = EMPTY_UNSPECIFIED,             \
 103                 .default_backend = "merge",             \
 104                 .flags = REBASE_NO_QUIET,               \
 105                 .git_am_opts = ARGV_ARRAY_INIT,         \
 106                 .git_format_patch_opt = STRBUF_INIT     \
 107         }
 108
 109 static 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;
 122         replay.drop_redundant_commits = (opts->empty == EMPTY_DROP);
 123         replay.keep_redundant_commits = (opts->empty == EMPTY_KEEP);
 124         replay.quiet = !(opts->flags & REBASE_NO_QUIET);
 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;
 129         if (opts->strategy_opts)
 130                 parse_strategy_opts(&replay, opts->strategy_opts);
 131
 132         if (opts->squash_onto) {
 133                 oidcpy(&replay.squash_onto, opts->squash_onto);
 134                 replay.have_squash_onto = 1;
 135         }
 136
 137         return replay;
 138 }
 139
 140 enum 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
 155 static const char *action_names[] = { "undefined",
 156                                       "continue",
 157                                       "skip",
 158                                       "abort",
 159                                       "quit",
 160                                       "edit_todo",
 161                                       "show_current_patch" };
 162
 163 static 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
 188 static 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
 214 static 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
 238 static 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
 260 static int get_revision_ranges(struct commit *upstream, struct commit *onto,
 261                                struct object_id *orig_head, const char **head_hash,
 262                                char **revisions, char **shortrevisions)
 263 {
 264         struct commit *base_rev = upstream ? upstream : onto;
 265         const char *shorthead;
 266
 267         *head_hash = find_unique_abbrev(orig_head, GIT_MAX_HEXSZ);
 268         *revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid),
 269                                                    *head_hash);
 270
 271         shorthead = find_unique_abbrev(orig_head, DEFAULT_ABBREV);
 272
 273         if (upstream) {
 274                 const char *shortrev;
 275
 276                 shortrev = find_unique_abbrev(&base_rev->object.oid,
 277                                               DEFAULT_ABBREV);
 278
 279                 *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead);
 280         } else
 281                 *shortrevisions = xstrdup(shorthead);
 282
 283         return 0;
 284 }
 285
 286 static int init_basic_state(struct replay_opts *opts, const char *head_name,
 287                             struct commit *onto, const char *orig_head)
 288 {
 289         FILE *interactive;
 290
 291         if (!is_directory(merge_dir()) && mkdir_in_gitdir(merge_dir()))
 292                 return error_errno(_("could not create temporary %s"), merge_dir());
 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
 304 static 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
 315 static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
 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;
 322         struct replay_opts replay = get_replay_opts(opts);
 323         struct string_list commands = STRING_LIST_INIT_DUP;
 324
 325         if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head,
 326                                 &head_hash, &revisions, &shortrevisions))
 327                 return -1;
 328
 329         if (init_basic_state(&replay,
 330                              opts->head_name ? opts->head_name : "detached HEAD",
 331                              opts->onto, head_hash)) {
 332                 free(revisions);
 333                 free(shortrevisions);
 334
 335                 return -1;
 336         }
 337
 338         if (!opts->upstream && opts->squash_onto)
 339                 write_file(path_squash_onto(), "%s\n",
 340                            oid_to_hex(opts->squash_onto));
 341
 342         argv_array_pushl(&make_script_args, "", revisions, NULL);
 343         if (opts->restrict_revision)
 344                 argv_array_pushf(&make_script_args, "^%s",
 345                                  oid_to_hex(&opts->restrict_revision->object.oid));
 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
 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);
 363         }
 364
 365         string_list_clear(&commands, 0);
 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
 374 static int run_sequencer_rebase(struct rebase_options *opts,
 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
 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;
 385         flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
 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
 445 static 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
 452         /*
 453          * If we ever want to remap --keep-empty to --empty=keep, insert:
 454          *      opts->empty = unset ? EMPTY_UNSPECIFIED : EMPTY_KEEP;
 455          */
 456         opts->type = REBASE_MERGE;
 457         return 0;
 458 }
 459
 460 static const char * const builtin_rebase_interactive_usage[] = {
 461         N_("git rebase--interactive [<options>]"),
 462         NULL
 463 };
 464
 465 int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
 466 {
 467         struct rebase_options opts = REBASE_OPTIONS_INIT;
 468         struct object_id squash_onto = null_oid;
 469         enum action command = ACTION_NONE;
 470         struct option options[] = {
 471                 OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
 472                            REBASE_FORCE),
 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 },
 477                 OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
 478                            N_("allow commits with empty messages"),
 479                            PARSE_OPT_HIDDEN),
 480                 OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")),
 481                 OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
 482                          N_("keep original branch points of cousins")),
 483                 OPT_BOOL(0, "autosquash", &opts.autosquash,
 484                          N_("move commits that begin with squash!/fixup!")),
 485                 OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
 486                 OPT_BIT('v', "verbose", &opts.flags,
 487                         N_("display a diffstat of what changed upstream"),
 488                         REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
 489                 OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
 490                             ACTION_CONTINUE),
 491                 OPT_CMDMODE(0, "skip", &command, N_("skip commit"), ACTION_SKIP),
 492                 OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
 493                             ACTION_EDIT_TODO),
 494                 OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
 495                             ACTION_SHOW_CURRENT_PATCH),
 496                 OPT_CMDMODE(0, "shorten-ids", &command,
 497                         N_("shorten commit ids in the todo list"), ACTION_SHORTEN_OIDS),
 498                 OPT_CMDMODE(0, "expand-ids", &command,
 499                         N_("expand commit ids in the todo list"), ACTION_EXPAND_OIDS),
 500                 OPT_CMDMODE(0, "check-todo-list", &command,
 501                         N_("check the todo list"), ACTION_CHECK_TODO_LIST),
 502                 OPT_CMDMODE(0, "rearrange-squash", &command,
 503                         N_("rearrange fixup/squash lines"), ACTION_REARRANGE_SQUASH),
 504                 OPT_CMDMODE(0, "add-exec-commands", &command,
 505                         N_("insert exec commands in todo list"), ACTION_ADD_EXEC),
 506                 { OPTION_CALLBACK, 0, "onto", &opts.onto, N_("onto"), N_("onto"),
 507                   PARSE_OPT_NONEG, parse_opt_commit, 0 },
 508                 { OPTION_CALLBACK, 0, "restrict-revision", &opts.restrict_revision,
 509                   N_("restrict-revision"), N_("restrict revision"),
 510                   PARSE_OPT_NONEG, parse_opt_commit, 0 },
 511                 { OPTION_CALLBACK, 0, "squash-onto", &squash_onto, N_("squash-onto"),
 512                   N_("squash onto"), PARSE_OPT_NONEG, parse_opt_object_id, 0 },
 513                 { OPTION_CALLBACK, 0, "upstream", &opts.upstream, N_("upstream"),
 514                   N_("the upstream commit"), PARSE_OPT_NONEG, parse_opt_commit,
 515                   0 },
 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"),
 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")),
 522                 OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
 523                            N_("strategy options")),
 524                 OPT_STRING(0, "switch-to", &opts.switch_to, N_("switch-to"),
 525                            N_("the branch or commit to checkout")),
 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),
 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
 534         opts.rebase_cousins = -1;
 535
 536         if (argc == 1)
 537                 usage_with_options(builtin_rebase_interactive_usage, options);
 538
 539         argc = parse_options(argc, argv, prefix, options,
 540                         builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
 541
 542         if (!is_null_oid(&squash_onto))
 543                 opts.squash_onto = &squash_onto;
 544
 545         if (opts.rebase_cousins >= 0 && !opts.rebase_merges)
 546                 warning(_("--[no-]rebase-cousins has no effect without "
 547                           "--rebase-merges"));
 548
 549         return !!run_sequencer_rebase(&opts, command);
 550 }
 551
 552 static int is_merge(struct rebase_options *opts)
 553 {
 554         return opts->type == REBASE_MERGE ||
 555                 opts->type == REBASE_PRESERVE_MERGES;
 556 }
 557
 558 static void imply_merge(struct rebase_options *opts, const char *option)
 559 {
 560         switch (opts->type) {
 561         case REBASE_APPLY:
 562                 die(_("%s requires an interactive rebase"), option);
 563                 break;
 564         case REBASE_MERGE:
 565         case REBASE_PRESERVE_MERGES:
 566                 break;
 567         default:
 568                 opts->type = REBASE_MERGE; /* implied */
 569                 break;
 570         }
 571 }
 572
 573 /* Returns the filename prefixed by the state_dir */
 574 static 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
 589 /* Read one file, then strip line endings */
 590 static 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. */
 599 static 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
 629         if (file_exists(state_dir_path("quiet", opts)))
 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
 637         if (file_exists(state_dir_path("signoff", opts))) {
 638                 opts->signoff = 1;
 639                 opts->flags |= REBASE_FORCE;
 640         }
 641
 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"))
 648                         opts->allow_rerere_autoupdate = RERERE_AUTOUPDATE;
 649                 else if (!strcmp(buf.buf, "--no-rerere-autoupdate"))
 650                         opts->allow_rerere_autoupdate = RERERE_NOAUTOUPDATE;
 651                 else
 652                         warning(_("ignoring invalid allow_rerere_autoupdate: "
 653                                   "'%s'"), buf.buf);
 654         }
 655
 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
 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
 681         strbuf_release(&buf);
 682
 683         return 0;
 684 }
 685
 686 static int rebase_write_basic_state(struct rebase_options *opts)
 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));
 694         if (!(opts->flags & REBASE_NO_QUIET))
 695                 write_file(state_dir_path("quiet", opts), "%s", "");
 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);
 704         if (opts->allow_rerere_autoupdate > 0)
 705                 write_file(state_dir_path("allow_rerere_autoupdate", opts),
 706                            "-%s-rerere-autoupdate",
 707                            opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
 708                                 "" : "-no");
 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)
 713                 write_file(state_dir_path("signoff", opts), "--signoff");
 714
 715         return 0;
 716 }
 717
 718 static 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
 727         if (read_one(path, &autostash))
 728                 return error(_("Could not read '%s'"), path);
 729         /* Ensure that the hash is not mistaken for a number */
 730         strbuf_addstr(&autostash, "^0");
 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
 763 static int finish_rebase(struct rebase_options *opts)
 764 {
 765         struct strbuf dir = STRBUF_INIT;
 766         const char *argv_gc_auto[] = { "gc", "--auto", NULL };
 767         int ret = 0;
 768
 769         delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
 770         apply_autostash(opts);
 771         close_object_store(the_repository->objects);
 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);
 777         if (opts->type == REBASE_MERGE) {
 778                 struct replay_opts replay = REPLAY_OPTS_INIT;
 779
 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         }
 789
 790         return ret;
 791 }
 792
 793 static 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
 804 static 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
 815 #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
 816
 817 #define RESET_HEAD_DETACH (1<<0)
 818 #define RESET_HEAD_HARD (1<<1)
 819 #define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
 820 #define RESET_HEAD_REFS_ONLY (1<<3)
 821 #define RESET_ORIG_HEAD (1<<4)
 822
 823 static 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;
 829         unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
 830         unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
 831         unsigned update_orig_head = flags & RESET_ORIG_HEAD;
 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
 847         if (!refs_only && hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) {
 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
 860         if (refs_only)
 861                 goto reset_head_refs;
 862
 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;
 871         init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
 872         if (!detach_head)
 873                 unpack_tree_opts.reset = 1;
 874
 875         if (repo_read_index_unmerged(the_repository) < 0) {
 876                 ret = error(_("could not read index"));
 877                 goto leave_reset_head;
 878         }
 879
 880         if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) {
 881                 ret = error(_("failed to find tree of %s"),
 882                             oid_to_hex(&head_oid));
 883                 goto leave_reset_head;
 884         }
 885
 886         if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) {
 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);
 897         prime_cache_tree(the_repository, the_repository->index, tree);
 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
 904 reset_head_refs:
 905         reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
 906         strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase");
 907         prefix_len = msg.len;
 908
 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
 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 {
 934                 ret = update_ref(reflog_head, switch_to_branch, oid,
 935                                  NULL, 0, UPDATE_REFS_MSG_ON_ERR);
 936                 if (!ret)
 937                         ret = create_symref("HEAD", switch_to_branch,
 938                                             reflog_head);
 939         }
 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);
 944
 945 leave_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
 953 static 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
 976 static const char *resolvemsg =
 977 N_("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
 983 static 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",
1041                          "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
1042                          "--no-base", NULL);
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");
1084         if (opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE)
1085                 argv_array_push(&am.args, "--rerere-autoupdate");
1086         else if (opts->allow_rerere_autoupdate == RERERE_NOAUTOUPDATE)
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))
1099                 rebase_write_basic_state(opts);
1100
1101         return status;
1102 }
1103
1104 static int run_specific_rebase(struct rebase_options *opts, enum action action)
1105 {
1106         const char *argv[] = { NULL, NULL };
1107         struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
1108         int status;
1109         const char *backend, *backend_func;
1110
1111         if (opts->type == REBASE_MERGE) {
1112                 /* Run sequencer-based rebase */
1113                 setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1);
1114                 if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
1115                         setenv("GIT_SEQUENCE_EDITOR", ":", 1);
1116                         opts->autosquash = 0;
1117                 }
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                 }
1124
1125                 status = run_sequencer_rebase(opts, action);
1126                 goto finished_rebase;
1127         }
1128
1129         if (opts->type == REBASE_APPLY) {
1130                 status = run_am(opts);
1131                 goto finished_rebase;
1132         }
1133
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);
1138         add_var(&script_snippet, "upstream", opts->upstream ?
1139                 oid_to_hex(&opts->upstream->object.oid) : NULL);
1140         add_var(&script_snippet, "head_name",
1141                 opts->head_name ? opts->head_name : "detached HEAD");
1142         add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
1143         add_var(&script_snippet, "onto", opts->onto ?
1144                 oid_to_hex(&opts->onto->object.oid) : NULL);
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);
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);
1152         add_var(&script_snippet, "verbose",
1153                 opts->flags & REBASE_VERBOSE ? "t" : "");
1154         add_var(&script_snippet, "diffstat",
1155                 opts->flags & REBASE_DIFFSTAT ? "t" : "");
1156         add_var(&script_snippet, "force_rebase",
1157                 opts->flags & REBASE_FORCE ? "t" : "");
1158         if (opts->switch_to)
1159                 add_var(&script_snippet, "switch_to", opts->switch_to);
1160         add_var(&script_snippet, "action", opts->action ? opts->action : "");
1161         add_var(&script_snippet, "signoff", opts->signoff ? "--signoff" : "");
1162         add_var(&script_snippet, "allow_rerere_autoupdate",
1163                 opts->allow_rerere_autoupdate ?
1164                         opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
1165                         "--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
1166         add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
1167         add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
1168         add_var(&script_snippet, "cmd", opts->cmd);
1169         add_var(&script_snippet, "allow_empty_message",
1170                 opts->allow_empty_message ?  "--allow-empty-message" : "");
1171         add_var(&script_snippet, "rebase_merges",
1172                 opts->rebase_merges ? "t" : "");
1173         add_var(&script_snippet, "rebase_cousins",
1174                 opts->rebase_cousins ? "t" : "");
1175         add_var(&script_snippet, "strategy", opts->strategy);
1176         add_var(&script_snippet, "strategy_opts", opts->strategy_opts);
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) : "");
1180         add_var(&script_snippet, "git_format_patch_opt",
1181                 opts->git_format_patch_opt.buf);
1182
1183         if (is_merge(opts) &&
1184             !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
1185                 strbuf_addstr(&script_snippet,
1186                               "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
1187                 opts->autosquash = 0;
1188         }
1189
1190         switch (opts->type) {
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,
1201                     ". git-sh-setup && . %s && %s", backend, backend_func);
1202         argv[0] = script_snippet.buf;
1203
1204         status = run_command_v_opt(argv, RUN_USING_SHELL);
1205 finished_rebase:
1206         if (opts->dont_finish_rebase)
1207                 ; /* do nothing */
1208         else if (opts->type == REBASE_MERGE)
1209                 ; /* merge backend cleans up after itself */
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
1216                 apply_autostash(opts);
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
1228 static 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
1236                         opts->flags &= ~REBASE_DIFFSTAT;
1237                 return 0;
1238         }
1239
1240         if (!strcmp(var, "rebase.autosquash")) {
1241                 opts->autosquash = git_config_bool(var, value);
1242                 return 0;
1243         }
1244
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
1252         if (!strcmp(var, "rebase.autostash")) {
1253                 opts->autostash = git_config_bool(var, value);
1254                 return 0;
1255         }
1256
1257         if (!strcmp(var, "rebase.reschedulefailedexec")) {
1258                 opts->reschedule_failed_exec = git_config_bool(var, value);
1259                 return 0;
1260         }
1261
1262         if (!strcmp(var, "rebase.usebuiltin")) {
1263                 opts->use_legacy_rebase = !git_config_bool(var, value);
1264                 return 0;
1265         }
1266
1267         if (!strcmp(var, "rebase.backend")) {
1268                 return git_config_string(&opts->default_backend, var, value);
1269         }
1270
1271         return git_default_config(var, value, data);
1272 }
1273
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  */
1279 static 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
1292 static int can_fast_forward(struct commit *onto, struct commit *upstream,
1293                             struct commit *restrict_revision,
1294                             struct object_id *head_oid, struct object_id *merge_base)
1295 {
1296         struct commit *head = lookup_commit(the_repository, head_oid);
1297         struct commit_list *merge_bases = NULL;
1298         int res = 0;
1299
1300         if (!head)
1301                 goto done;
1302
1303         merge_bases = get_merge_bases(onto, head);
1304         if (!merge_bases || merge_bases->next) {
1305                 oidcpy(merge_base, &null_oid);
1306                 goto done;
1307         }
1308
1309         oidcpy(merge_base, &merge_bases->item->object.oid);
1310         if (!oideq(merge_base, &onto->object.oid))
1311                 goto done;
1312
1313         if (restrict_revision && !oideq(&restrict_revision->object.oid, merge_base))
1314                 goto done;
1315
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
1327         res = 1;
1328
1329 done:
1330         free_commit_list(merge_bases);
1331         return res && is_linear_history(onto, head);
1332 }
1333
1334 static 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
1341         opts->type = REBASE_APPLY;
1342
1343         return 0;
1344 }
1345
1346 /* -i followed by -m is still -i */
1347 static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
1348 {
1349         struct rebase_options *opts = opt->value;
1350
1351         BUG_ON_OPT_NEG(unset);
1352         BUG_ON_OPT_ARG(arg);
1353
1354         if (!is_merge(opts))
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 */
1361 static int parse_opt_interactive(const struct option *opt, const char *arg,
1362                                  int unset)
1363 {
1364         struct rebase_options *opts = opt->value;
1365
1366         BUG_ON_OPT_NEG(unset);
1367         BUG_ON_OPT_ARG(arg);
1368
1369         opts->type = REBASE_MERGE;
1370         opts->flags |= REBASE_INTERACTIVE_EXPLICIT;
1371
1372         return 0;
1373 }
1374
1375 static 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
1387 static 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
1398 static 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
1428 static void set_reflog_action(struct rebase_options *options)
1429 {
1430         const char *env;
1431         struct strbuf buf = STRBUF_INIT;
1432
1433         if (!is_merge(options))
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
1440         strbuf_addf(&buf, "rebase (%s)", options->action);
1441         setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1);
1442         strbuf_release(&buf);
1443 }
1444
1445 static 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
1458 int cmd_rebase(int argc, const char **argv, const char *prefix)
1459 {
1460         struct rebase_options options = REBASE_OPTIONS_INIT;
1461         const char *branch_name;
1462         int ret, flags, total_argc, in_progress = 0;
1463         int keep_base = 0;
1464         int ok_to_skip_pre_rebase = 0;
1465         struct strbuf msg = STRBUF_INIT;
1466         struct strbuf revisions = STRBUF_INIT;
1467         struct strbuf buf = STRBUF_INIT;
1468         struct object_id merge_base;
1469         enum action action = ACTION_NONE;
1470         const char *gpg_sign = NULL;
1471         struct string_list exec = STRING_LIST_INIT_NODUP;
1472         const char *rebase_merges = NULL;
1473         int fork_point = -1;
1474         struct string_list strategy_options = STRING_LIST_INIT_NODUP;
1475         struct object_id squash_onto;
1476         char *squash_onto_name = NULL;
1477         int reschedule_failed_exec = -1;
1478         int allow_preemptive_ff = 1;
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")),
1483                 OPT_BOOL(0, "keep-base", &keep_base,
1484                          N_("use the merge-base of upstream and branch as the current base")),
1485                 OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase,
1486                          N_("allow pre-rebase hook to run")),
1487                 OPT_NEGBIT('q', "quiet", &options.flags,
1488                            N_("be quiet. implies --no-stat"),
1489                            REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
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 },
1496                 OPT_BOOL(0, "signoff", &options.signoff,
1497                          N_("add a Signed-off-by: line to each commit")),
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),
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),
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),
1516                 OPT_CMDMODE(0, "continue", &action, N_("continue"),
1517                             ACTION_CONTINUE),
1518                 OPT_CMDMODE(0, "skip", &action,
1519                             N_("skip current patch and continue"), ACTION_SKIP),
1520                 OPT_CMDMODE(0, "abort", &action,
1521                             N_("abort and check out the original branch"),
1522                             ACTION_ABORT),
1523                 OPT_CMDMODE(0, "quit", &action,
1524                             N_("abort but keep HEAD where it is"), ACTION_QUIT),
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),
1530                 { OPTION_CALLBACK, 0, "apply", &options, NULL,
1531                         N_("use apply strategies to rebase"),
1532                         PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1533                         parse_opt_am },
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 },
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),
1546                 OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
1547                 OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
1548                                N_("how to handle commits that become empty"),
1549                                PARSE_OPT_NONEG, parse_opt_empty),
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 },
1554                 OPT_BOOL(0, "autosquash", &options.autosquash,
1555                          N_("move commits that begin with "
1556                             "squash!/fixup! under -i")),
1557                 { OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
1558                         N_("GPG-sign commits"),
1559                         PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
1560                 OPT_BOOL(0, "autostash", &options.autostash,
1561                          N_("automatically stash/stash pop before and after")),
1562                 OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
1563                                 N_("add exec lines after each commit of the "
1564                                    "editable list")),
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),
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)""},
1573                 OPT_BOOL(0, "fork-point", &fork_point,
1574                          N_("use 'merge-base --fork-point' to refine upstream")),
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")),
1581                 OPT_BOOL(0, "root", &options.root,
1582                          N_("rebase all reachable commits up to the root(s)")),
1583                 OPT_BOOL(0, "reschedule-failed-exec",
1584                          &reschedule_failed_exec,
1585                          N_("automatically re-schedule any `exec` that fails")),
1586                 OPT_END(),
1587         };
1588         int i;
1589
1590         if (argc == 2 && !strcmp(argv[1], "-h"))
1591                 usage_with_options(builtin_rebase_usage,
1592                                    builtin_rebase_options);
1593
1594         options.allow_empty_message = 1;
1595         git_config(rebase_config, &options);
1596         /* options.gpg_sign_opt will be either "-S" or NULL */
1597         gpg_sign = options.gpg_sign_opt ? "" : NULL;
1598         FREE_AND_NULL(options.gpg_sign_opt);
1599
1600         if (options.use_legacy_rebase ||
1601             !git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1))
1602                 warning(_("the rebase.useBuiltin support has been removed!\n"
1603                           "See its entry in 'git help config' for details."));
1604
1605         strbuf_reset(&buf);
1606         strbuf_addf(&buf, "%s/applying", apply_dir());
1607         if(file_exists(buf.buf))
1608                 die(_("It looks like 'git am' is in progress. Cannot rebase."));
1609
1610         if (is_directory(apply_dir())) {
1611                 options.type = REBASE_APPLY;
1612                 options.state_dir = apply_dir();
1613         } else if (is_directory(merge_dir())) {
1614                 strbuf_reset(&buf);
1615                 strbuf_addf(&buf, "%s/rewritten", merge_dir());
1616                 if (is_directory(buf.buf)) {
1617                         options.type = REBASE_PRESERVE_MERGES;
1618                         options.flags |= REBASE_INTERACTIVE_EXPLICIT;
1619                 } else {
1620                         strbuf_reset(&buf);
1621                         strbuf_addf(&buf, "%s/interactive", merge_dir());
1622                         if(file_exists(buf.buf)) {
1623                                 options.type = REBASE_MERGE;
1624                                 options.flags |= REBASE_INTERACTIVE_EXPLICIT;
1625                         } else
1626                                 options.type = REBASE_MERGE;
1627                 }
1628                 options.state_dir = merge_dir();
1629         }
1630
1631         if (options.type != REBASE_UNSPECIFIED)
1632                 in_progress = 1;
1633
1634         total_argc = argc;
1635         argc = parse_options(argc, argv, prefix,
1636                              builtin_rebase_options,
1637                              builtin_rebase_usage, 0);
1638
1639         if (action != ACTION_NONE && total_argc != 2) {
1640                 usage_with_options(builtin_rebase_usage,
1641                                    builtin_rebase_options);
1642         }
1643
1644         if (argc > 2)
1645                 usage_with_options(builtin_rebase_usage,
1646                                    builtin_rebase_options);
1647
1648         if (options.type == REBASE_PRESERVE_MERGES)
1649                 warning(_("git rebase --preserve-merges is deprecated. "
1650                           "Use --rebase-merges instead."));
1651
1652         if (keep_base) {
1653                 if (options.onto_name)
1654                         die(_("cannot combine '--keep-base' with '--onto'"));
1655                 if (options.root)
1656                         die(_("cannot combine '--keep-base' with '--root'"));
1657         }
1658
1659         if (action != ACTION_NONE && !in_progress)
1660                 die(_("No rebase in progress?"));
1661         setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
1662
1663         if (action == ACTION_EDIT_TODO && !is_merge(&options))
1664                 die(_("The --edit-todo action can only be used during "
1665                       "interactive rebase."));
1666
1667         if (trace2_is_enabled()) {
1668                 if (is_merge(&options))
1669                         trace2_cmd_mode("interactive");
1670                 else if (exec.nr)
1671                         trace2_cmd_mode("interactive-exec");
1672                 else
1673                         trace2_cmd_mode(action_names[action]);
1674         }
1675
1676         switch (action) {
1677         case ACTION_CONTINUE: {
1678                 struct object_id head;
1679                 struct lock_file lock_file = LOCK_INIT;
1680                 int fd;
1681
1682                 options.action = "continue";
1683                 set_reflog_action(&options);
1684
1685                 /* Sanity check */
1686                 if (get_oid("HEAD", &head))
1687                         die(_("Cannot read HEAD"));
1688
1689                 fd = hold_locked_index(&lock_file, 0);
1690                 if (repo_read_index(the_repository) < 0)
1691                         die(_("could not read index"));
1692                 refresh_index(the_repository->index, REFRESH_QUIET, NULL, NULL,
1693                               NULL);
1694                 if (0 <= fd)
1695                         repo_update_index_if_able(the_repository, &lock_file);
1696                 rollback_lock_file(&lock_file);
1697
1698                 if (has_unstaged_changes(the_repository, 1)) {
1699                         puts(_("You must edit all merge conflicts and then\n"
1700                                "mark them as resolved using git add"));
1701                         exit(1);
1702                 }
1703                 if (read_basic_state(&options))
1704                         exit(1);
1705                 goto run_rebase;
1706         }
1707         case ACTION_SKIP: {
1708                 struct string_list merge_rr = STRING_LIST_INIT_DUP;
1709
1710                 options.action = "skip";
1711                 set_reflog_action(&options);
1712
1713                 rerere_clear(the_repository, &merge_rr);
1714                 string_list_clear(&merge_rr, 1);
1715
1716                 if (reset_head(NULL, "reset", NULL, RESET_HEAD_HARD,
1717                                NULL, NULL) < 0)
1718                         die(_("could not discard worktree changes"));
1719                 remove_branch_state(the_repository, 0);
1720                 if (read_basic_state(&options))
1721                         exit(1);
1722                 goto run_rebase;
1723         }
1724         case ACTION_ABORT: {
1725                 struct string_list merge_rr = STRING_LIST_INIT_DUP;
1726                 options.action = "abort";
1727                 set_reflog_action(&options);
1728
1729                 rerere_clear(the_repository, &merge_rr);
1730                 string_list_clear(&merge_rr, 1);
1731
1732                 if (read_basic_state(&options))
1733                         exit(1);
1734                 if (reset_head(&options.orig_head, "reset",
1735                                options.head_name, RESET_HEAD_HARD,
1736                                NULL, NULL) < 0)
1737                         die(_("could not move back to %s"),
1738                             oid_to_hex(&options.orig_head));
1739                 remove_branch_state(the_repository, 0);
1740                 ret = !!finish_rebase(&options);
1741                 goto cleanup;
1742         }
1743         case ACTION_QUIT: {
1744                 if (options.type == REBASE_MERGE) {
1745                         struct replay_opts replay = REPLAY_OPTS_INIT;
1746
1747                         replay.action = REPLAY_INTERACTIVE_REBASE;
1748                         ret = !!sequencer_remove_state(&replay);
1749                 } else {
1750                         strbuf_reset(&buf);
1751                         strbuf_addstr(&buf, options.state_dir);
1752                         ret = !!remove_dir_recursively(&buf, 0);
1753                         if (ret)
1754                                 error(_("could not remove '%s'"),
1755                                        options.state_dir);
1756                 }
1757                 goto cleanup;
1758         }
1759         case ACTION_EDIT_TODO:
1760                 options.action = "edit-todo";
1761                 options.dont_finish_rebase = 1;
1762                 goto run_rebase;
1763         case ACTION_SHOW_CURRENT_PATCH:
1764                 options.action = "show-current-patch";
1765                 options.dont_finish_rebase = 1;
1766                 goto run_rebase;
1767         case ACTION_NONE:
1768                 break;
1769         default:
1770                 BUG("action: %d", action);
1771         }
1772
1773         /* Make sure no rebase is in progress */
1774         if (in_progress) {
1775                 const char *last_slash = strrchr(options.state_dir, '/');
1776                 const char *state_dir_base =
1777                         last_slash ? last_slash + 1 : options.state_dir;
1778                 const char *cmd_live_rebase =
1779                         "git rebase (--continue | --abort | --skip)";
1780                 strbuf_reset(&buf);
1781                 strbuf_addf(&buf, "rm -fr \"%s\"", options.state_dir);
1782                 die(_("It seems that there is already a %s directory, and\n"
1783                       "I wonder if you are in the middle of another rebase.  "
1784                       "If that is the\n"
1785                       "case, please try\n\t%s\n"
1786                       "If that is not the case, please\n\t%s\n"
1787                       "and run me again.  I am stopping in case you still "
1788                       "have something\n"
1789                       "valuable there.\n"),
1790                     state_dir_base, cmd_live_rebase, buf.buf);
1791         }
1792
1793         if ((options.flags & REBASE_INTERACTIVE_EXPLICIT) ||
1794             (action != ACTION_NONE) ||
1795             (exec.nr > 0) ||
1796             options.autosquash) {
1797                 allow_preemptive_ff = 0;
1798         }
1799
1800         for (i = 0; i < options.git_am_opts.argc; i++) {
1801                 const char *option = options.git_am_opts.argv[i], *p;
1802                 if (!strcmp(option, "--committer-date-is-author-date") ||
1803                     !strcmp(option, "--ignore-date") ||
1804                     !strcmp(option, "--whitespace=fix") ||
1805                     !strcmp(option, "--whitespace=strip"))
1806                         allow_preemptive_ff = 0;
1807                 else if (skip_prefix(option, "-C", &p)) {
1808                         while (*p)
1809                                 if (!isdigit(*(p++)))
1810                                         die(_("switch `C' expects a "
1811                                               "numerical value"));
1812                 } else if (skip_prefix(option, "--whitespace=", &p)) {
1813                         if (*p && strcmp(p, "warn") && strcmp(p, "nowarn") &&
1814                             strcmp(p, "error") && strcmp(p, "error-all"))
1815                                 die("Invalid whitespace option: '%s'", p);
1816                 }
1817         }
1818
1819         for (i = 0; i < exec.nr; i++)
1820                 if (check_exec_cmd(exec.items[i].string))
1821                         exit(1);
1822
1823         if (!(options.flags & REBASE_NO_QUIET))
1824                 argv_array_push(&options.git_am_opts, "-q");
1825
1826         if (options.empty != EMPTY_UNSPECIFIED)
1827                 imply_merge(&options, "--empty");
1828
1829         if (gpg_sign)
1830                 options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
1831
1832         if (exec.nr) {
1833                 int i;
1834
1835                 imply_merge(&options, "--exec");
1836
1837                 strbuf_reset(&buf);
1838                 for (i = 0; i < exec.nr; i++)
1839                         strbuf_addf(&buf, "exec %s\n", exec.items[i].string);
1840                 options.cmd = xstrdup(buf.buf);
1841         }
1842
1843         if (rebase_merges) {
1844                 if (!*rebase_merges)
1845                         ; /* default mode; do nothing */
1846                 else if (!strcmp("rebase-cousins", rebase_merges))
1847                         options.rebase_cousins = 1;
1848                 else if (strcmp("no-rebase-cousins", rebase_merges))
1849                         die(_("Unknown mode: %s"), rebase_merges);
1850                 options.rebase_merges = 1;
1851                 imply_merge(&options, "--rebase-merges");
1852         }
1853
1854         if (strategy_options.nr) {
1855                 int i;
1856
1857                 if (!options.strategy)
1858                         options.strategy = "recursive";
1859
1860                 strbuf_reset(&buf);
1861                 for (i = 0; i < strategy_options.nr; i++)
1862                         strbuf_addf(&buf, " --%s",
1863                                     strategy_options.items[i].string);
1864                 options.strategy_opts = xstrdup(buf.buf);
1865         }
1866
1867         if (options.strategy) {
1868                 options.strategy = xstrdup(options.strategy);
1869                 switch (options.type) {
1870                 case REBASE_APPLY:
1871                         die(_("--strategy requires --merge or --interactive"));
1872                 case REBASE_MERGE:
1873                 case REBASE_PRESERVE_MERGES:
1874                         /* compatible */
1875                         break;
1876                 case REBASE_UNSPECIFIED:
1877                         options.type = REBASE_MERGE;
1878                         break;
1879                 default:
1880                         BUG("unhandled rebase type (%d)", options.type);
1881                 }
1882         }
1883
1884         if (options.type == REBASE_MERGE)
1885                 imply_merge(&options, "--merge");
1886
1887         if (options.root && !options.onto_name)
1888                 imply_merge(&options, "--root without --onto");
1889
1890         if (isatty(2) && options.flags & REBASE_NO_QUIET)
1891                 strbuf_addstr(&options.git_format_patch_opt, " --progress");
1892
1893         if (options.git_am_opts.argc || options.type == REBASE_APPLY) {
1894                 /* all am options except -q are compatible only with --apply */
1895                 for (i = options.git_am_opts.argc - 1; i >= 0; i--)
1896                         if (strcmp(options.git_am_opts.argv[i], "-q"))
1897                                 break;
1898
1899                 if (i >= 0) {
1900                         if (is_merge(&options))
1901                                 die(_("cannot combine apply options with "
1902                                       "merge options"));
1903                         else
1904                                 options.type = REBASE_APPLY;
1905                 }
1906         }
1907
1908         if (options.type == REBASE_UNSPECIFIED) {
1909                 if (!strcmp(options.default_backend, "merge"))
1910                         imply_merge(&options, "--merge");
1911                 else if (!strcmp(options.default_backend, "apply"))
1912                         options.type = REBASE_APPLY;
1913                 else
1914                         die(_("Unknown rebase backend: %s"),
1915                             options.default_backend);
1916         }
1917
1918         switch (options.type) {
1919         case REBASE_MERGE:
1920         case REBASE_PRESERVE_MERGES:
1921                 options.state_dir = merge_dir();
1922                 break;
1923         case REBASE_APPLY:
1924                 options.state_dir = apply_dir();
1925                 break;
1926         default:
1927                 BUG("options.type was just set above; should be unreachable.");
1928         }
1929
1930         if (options.empty == EMPTY_UNSPECIFIED) {
1931                 if (options.flags & REBASE_INTERACTIVE_EXPLICIT)
1932                         options.empty = EMPTY_ASK;
1933                 else if (exec.nr > 0)
1934                         options.empty = EMPTY_KEEP;
1935                 else
1936                         options.empty = EMPTY_DROP;
1937         }
1938         if (reschedule_failed_exec > 0 && !is_merge(&options))
1939                 die(_("--reschedule-failed-exec requires "
1940                       "--exec or --interactive"));
1941         if (reschedule_failed_exec >= 0)
1942                 options.reschedule_failed_exec = reschedule_failed_exec;
1943
1944         if (options.signoff) {
1945                 if (options.type == REBASE_PRESERVE_MERGES)
1946                         die("cannot combine '--signoff' with "
1947                             "'--preserve-merges'");
1948                 argv_array_push(&options.git_am_opts, "--signoff");
1949                 options.flags |= REBASE_FORCE;
1950         }
1951
1952         if (options.type == REBASE_PRESERVE_MERGES) {
1953                 /*
1954                  * Note: incompatibility with --signoff handled in signoff block above
1955                  * Note: incompatibility with --interactive is just a strong warning;
1956                  *       git-rebase.txt caveats with "unless you know what you are doing"
1957                  */
1958                 if (options.rebase_merges)
1959                         die(_("cannot combine '--preserve-merges' with "
1960                               "'--rebase-merges'"));
1961
1962                 if (options.reschedule_failed_exec)
1963                         die(_("error: cannot combine '--preserve-merges' with "
1964                               "'--reschedule-failed-exec'"));
1965         }
1966
1967         if (!options.root) {
1968                 if (argc < 1) {
1969                         struct branch *branch;
1970
1971                         branch = branch_get(NULL);
1972                         options.upstream_name = branch_get_upstream(branch,
1973                                                                     NULL);
1974                         if (!options.upstream_name)
1975                                 error_on_missing_default_upstream();
1976                         if (fork_point < 0)
1977                                 fork_point = 1;
1978                 } else {
1979                         options.upstream_name = argv[0];
1980                         argc--;
1981                         argv++;
1982                         if (!strcmp(options.upstream_name, "-"))
1983                                 options.upstream_name = "@{-1}";
1984                 }
1985                 options.upstream = peel_committish(options.upstream_name);
1986                 if (!options.upstream)
1987                         die(_("invalid upstream '%s'"), options.upstream_name);
1988                 options.upstream_arg = options.upstream_name;
1989         } else {
1990                 if (!options.onto_name) {
1991                         if (commit_tree("", 0, the_hash_algo->empty_tree, NULL,
1992                                         &squash_onto, NULL, NULL) < 0)
1993                                 die(_("Could not create new root commit"));
1994                         options.squash_onto = &squash_onto;
1995                         options.onto_name = squash_onto_name =
1996                                 xstrdup(oid_to_hex(&squash_onto));
1997                 } else
1998                         options.root_with_onto = 1;
1999
2000                 options.upstream_name = NULL;
2001                 options.upstream = NULL;
2002                 if (argc > 1)
2003                         usage_with_options(builtin_rebase_usage,
2004                                            builtin_rebase_options);
2005                 options.upstream_arg = "--root";
2006         }
2007
2008         /* Make sure the branch to rebase onto is valid. */
2009         if (keep_base) {
2010                 strbuf_reset(&buf);
2011                 strbuf_addstr(&buf, options.upstream_name);
2012                 strbuf_addstr(&buf, "...");
2013                 options.onto_name = xstrdup(buf.buf);
2014         } else if (!options.onto_name)
2015                 options.onto_name = options.upstream_name;
2016         if (strstr(options.onto_name, "...")) {
2017                 if (get_oid_mb(options.onto_name, &merge_base) < 0) {
2018                         if (keep_base)
2019                                 die(_("'%s': need exactly one merge base with branch"),
2020                                     options.upstream_name);
2021                         else
2022                                 die(_("'%s': need exactly one merge base"),
2023                                     options.onto_name);
2024                 }
2025                 options.onto = lookup_commit_or_die(&merge_base,
2026                                                     options.onto_name);
2027         } else {
2028                 options.onto = peel_committish(options.onto_name);
2029                 if (!options.onto)
2030                         die(_("Does not point to a valid commit '%s'"),
2031                                 options.onto_name);
2032         }
2033
2034         /*
2035          * If the branch to rebase is given, that is the branch we will rebase
2036          * branch_name -- branch/commit being rebased, or
2037          *                HEAD (already detached)
2038          * orig_head -- commit object name of tip of the branch before rebasing
2039          * head_name -- refs/heads/<that-branch> or NULL (detached HEAD)
2040          */
2041         if (argc == 1) {
2042                 /* Is it "rebase other branchname" or "rebase other commit"? */
2043                 branch_name = argv[0];
2044                 options.switch_to = argv[0];
2045
2046                 /* Is it a local branch? */
2047                 strbuf_reset(&buf);
2048                 strbuf_addf(&buf, "refs/heads/%s", branch_name);
2049                 if (!read_ref(buf.buf, &options.orig_head)) {
2050                         die_if_checked_out(buf.buf, 1);
2051                         options.head_name = xstrdup(buf.buf);
2052                 /* If not is it a valid ref (branch or commit)? */
2053                 } else if (!get_oid(branch_name, &options.orig_head))
2054                         options.head_name = NULL;
2055                 else
2056                         die(_("fatal: no such branch/commit '%s'"),
2057                             branch_name);
2058         } else if (argc == 0) {
2059                 /* Do not need to switch branches, we are already on it. */
2060                 options.head_name =
2061                         xstrdup_or_null(resolve_ref_unsafe("HEAD", 0, NULL,
2062                                          &flags));
2063                 if (!options.head_name)
2064                         die(_("No such ref: %s"), "HEAD");
2065                 if (flags & REF_ISSYMREF) {
2066                         if (!skip_prefix(options.head_name,
2067                                          "refs/heads/", &branch_name))
2068                                 branch_name = options.head_name;
2069
2070                 } else {
2071                         FREE_AND_NULL(options.head_name);
2072                         branch_name = "HEAD";
2073                 }
2074                 if (get_oid("HEAD", &options.orig_head))
2075                         die(_("Could not resolve HEAD to a revision"));
2076         } else
2077                 BUG("unexpected number of arguments left to parse");
2078
2079         if (fork_point > 0) {
2080                 struct commit *head =
2081                         lookup_commit_reference(the_repository,
2082                                                 &options.orig_head);
2083                 options.restrict_revision =
2084                         get_fork_point(options.upstream_name, head);
2085         }
2086
2087         if (repo_read_index(the_repository) < 0)
2088                 die(_("could not read index"));
2089
2090         if (options.autostash) {
2091                 struct lock_file lock_file = LOCK_INIT;
2092                 int fd;
2093
2094                 fd = hold_locked_index(&lock_file, 0);
2095                 refresh_cache(REFRESH_QUIET);
2096                 if (0 <= fd)
2097                         repo_update_index_if_able(the_repository, &lock_file);
2098                 rollback_lock_file(&lock_file);
2099
2100                 if (has_unstaged_changes(the_repository, 1) ||
2101                     has_uncommitted_changes(the_repository, 1)) {
2102                         const char *autostash =
2103                                 state_dir_path("autostash", &options);
2104                         struct child_process stash = CHILD_PROCESS_INIT;
2105                         struct object_id oid;
2106
2107                         argv_array_pushl(&stash.args,
2108                                          "stash", "create", "autostash", NULL);
2109                         stash.git_cmd = 1;
2110                         stash.no_stdin = 1;
2111                         strbuf_reset(&buf);
2112                         if (capture_command(&stash, &buf, GIT_MAX_HEXSZ))
2113                                 die(_("Cannot autostash"));
2114                         strbuf_trim_trailing_newline(&buf);
2115                         if (get_oid(buf.buf, &oid))
2116                                 die(_("Unexpected stash response: '%s'"),
2117                                     buf.buf);
2118                         strbuf_reset(&buf);
2119                         strbuf_add_unique_abbrev(&buf, &oid, DEFAULT_ABBREV);
2120
2121                         if (safe_create_leading_directories_const(autostash))
2122                                 die(_("Could not create directory for '%s'"),
2123                                     options.state_dir);
2124                         write_file(autostash, "%s", oid_to_hex(&oid));
2125                         printf(_("Created autostash: %s\n"), buf.buf);
2126                         if (reset_head(NULL, "reset --hard",
2127                                        NULL, RESET_HEAD_HARD, NULL, NULL) < 0)
2128                                 die(_("could not reset --hard"));
2129
2130                         if (discard_index(the_repository->index) < 0 ||
2131                                 repo_read_index(the_repository) < 0)
2132                                 die(_("could not read index"));
2133                 }
2134         }
2135
2136         if (require_clean_work_tree(the_repository, "rebase",
2137                                     _("Please commit or stash them."), 1, 1)) {
2138                 ret = 1;
2139                 goto cleanup;
2140         }
2141
2142         /*
2143          * Now we are rebasing commits upstream..orig_head (or with --root,
2144          * everything leading up to orig_head) on top of onto.
2145          */
2146
2147         /*
2148          * Check if we are already based on onto with linear history,
2149          * in which case we could fast-forward without replacing the commits
2150          * with new commits recreated by replaying their changes.
2151          *
2152          * Note that can_fast_forward() initializes merge_base, so we have to
2153          * call it before checking allow_preemptive_ff.
2154          */
2155         if (can_fast_forward(options.onto, options.upstream, options.restrict_revision,
2156                     &options.orig_head, &merge_base) &&
2157             allow_preemptive_ff) {
2158                 int flag;
2159
2160                 if (!(options.flags & REBASE_FORCE)) {
2161                         /* Lazily switch to the target branch if needed... */
2162                         if (options.switch_to) {
2163                                 strbuf_reset(&buf);
2164                                 strbuf_addf(&buf, "%s: checkout %s",
2165                                             getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
2166                                             options.switch_to);
2167                                 if (reset_head(&options.orig_head, "checkout",
2168                                                options.head_name,
2169                                                RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
2170                                                NULL, buf.buf) < 0) {
2171                                         ret = !!error(_("could not switch to "
2172                                                         "%s"),
2173                                                       options.switch_to);
2174                                         goto cleanup;
2175                                 }
2176                         }
2177
2178                         if (!(options.flags & REBASE_NO_QUIET))
2179                                 ; /* be quiet */
2180                         else if (!strcmp(branch_name, "HEAD") &&
2181                                  resolve_ref_unsafe("HEAD", 0, NULL, &flag))
2182                                 puts(_("HEAD is up to date."));
2183                         else
2184                                 printf(_("Current branch %s is up to date.\n"),
2185                                        branch_name);
2186                         ret = !!finish_rebase(&options);
2187                         goto cleanup;
2188                 } else if (!(options.flags & REBASE_NO_QUIET))
2189                         ; /* be quiet */
2190                 else if (!strcmp(branch_name, "HEAD") &&
2191                          resolve_ref_unsafe("HEAD", 0, NULL, &flag))
2192                         puts(_("HEAD is up to date, rebase forced."));
2193                 else
2194                         printf(_("Current branch %s is up to date, rebase "
2195                                  "forced.\n"), branch_name);
2196         }
2197
2198         /* If a hook exists, give it a chance to interrupt*/
2199         if (!ok_to_skip_pre_rebase &&
2200             run_hook_le(NULL, "pre-rebase", options.upstream_arg,
2201                         argc ? argv[0] : NULL, NULL))
2202                 die(_("The pre-rebase hook refused to rebase."));
2203
2204         if (options.flags & REBASE_DIFFSTAT) {
2205                 struct diff_options opts;
2206
2207                 if (options.flags & REBASE_VERBOSE) {
2208                         if (is_null_oid(&merge_base))
2209                                 printf(_("Changes to %s:\n"),
2210                                        oid_to_hex(&options.onto->object.oid));
2211                         else
2212                                 printf(_("Changes from %s to %s:\n"),
2213                                        oid_to_hex(&merge_base),
2214                                        oid_to_hex(&options.onto->object.oid));
2215                 }
2216
2217                 /* We want color (if set), but no pager */
2218                 diff_setup(&opts);
2219                 opts.stat_width = -1; /* use full terminal width */
2220                 opts.stat_graph_width = -1; /* respect statGraphWidth config */
2221                 opts.output_format |=
2222                         DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
2223                 opts.detect_rename = DIFF_DETECT_RENAME;
2224                 diff_setup_done(&opts);
2225                 diff_tree_oid(is_null_oid(&merge_base) ?
2226                               the_hash_algo->empty_tree : &merge_base,
2227                               &options.onto->object.oid, "", &opts);
2228                 diffcore_std(&opts);
2229                 diff_flush(&opts);
2230         }
2231
2232         if (is_merge(&options))
2233                 goto run_rebase;
2234
2235         /* Detach HEAD and reset the tree */
2236         if (options.flags & REBASE_NO_QUIET)
2237                 printf(_("First, rewinding head to replay your work on top of "
2238                          "it...\n"));
2239
2240         strbuf_addf(&msg, "%s: checkout %s",
2241                     getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
2242         if (reset_head(&options.onto->object.oid, "checkout", NULL,
2243                        RESET_HEAD_DETACH | RESET_ORIG_HEAD |
2244                        RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
2245                        NULL, msg.buf))
2246                 die(_("Could not detach HEAD"));
2247         strbuf_release(&msg);
2248
2249         /*
2250          * If the onto is a proper descendant of the tip of the branch, then
2251          * we just fast-forwarded.
2252          */
2253         strbuf_reset(&msg);
2254         if (oideq(&merge_base, &options.orig_head)) {
2255                 printf(_("Fast-forwarded %s to %s.\n"),
2256                         branch_name, options.onto_name);
2257                 strbuf_addf(&msg, "rebase finished: %s onto %s",
2258                         options.head_name ? options.head_name : "detached HEAD",
2259                         oid_to_hex(&options.onto->object.oid));
2260                 reset_head(NULL, "Fast-forwarded", options.head_name,
2261                            RESET_HEAD_REFS_ONLY, "HEAD", msg.buf);
2262                 strbuf_release(&msg);
2263                 ret = !!finish_rebase(&options);
2264                 goto cleanup;
2265         }
2266
2267         strbuf_addf(&revisions, "%s..%s",
2268                     options.root ? oid_to_hex(&options.onto->object.oid) :
2269                     (options.restrict_revision ?
2270                      oid_to_hex(&options.restrict_revision->object.oid) :
2271                      oid_to_hex(&options.upstream->object.oid)),
2272                     oid_to_hex(&options.orig_head));
2273
2274         options.revisions = revisions.buf;
2275
2276 run_rebase:
2277         ret = !!run_specific_rebase(&options, action);
2278
2279 cleanup:
2280         strbuf_release(&buf);
2281         strbuf_release(&revisions);
2282         free(options.head_name);
2283         free(options.gpg_sign_opt);
2284         free(options.cmd);
2285         free(squash_onto_name);
2286         return ret;
2287 }