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