?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
rebase: dereference tags
[git/debian.git] / builtin / rebase.c
blobf82bfaed118dfbe79ed374133d4ec2c98843cf6b
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 void add_var(struct strbuf *buf, const char *name, const char *value)
767 {
768 if (!value)
769 strbuf_addf(buf, "unset %s; ", name);
770 else {
771 strbuf_addf(buf, "%s=", name);
772 sq_quote_buf(buf, value);
773 strbuf_addstr(buf, "; ");
774 }
775 }
776
777 static int move_to_original_branch(struct rebase_options *opts)
778 {
779 struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
780 int ret;
781
782 if (!opts->head_name)
783 return 0; /* nothing to move back to */
784
785 if (!opts->onto)
786 BUG("move_to_original_branch without onto");
787
788 strbuf_addf(&orig_head_reflog, "rebase finished: %s onto %s",
789 opts->head_name, oid_to_hex(&opts->onto->object.oid));
790 strbuf_addf(&head_reflog, "rebase finished: returning to %s",
791 opts->head_name);
792 ret = reset_head(the_repository, NULL, "", opts->head_name,
793 RESET_HEAD_REFS_ONLY,
794 orig_head_reflog.buf, head_reflog.buf,
795 DEFAULT_REFLOG_ACTION);
796
797 strbuf_release(&orig_head_reflog);
798 strbuf_release(&head_reflog);
799 return ret;
800 }
801
802 static const char *resolvemsg =
803 N_("Resolve all conflicts manually, mark them as resolved with\n"
804 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
805 "You can instead skip this commit: run \"git rebase --skip\".\n"
806 "To abort and get back to the state before \"git rebase\", run "
807 "\"git rebase --abort\".");
808
809 static int run_am(struct rebase_options *opts)
810 {
811 struct child_process am = CHILD_PROCESS_INIT;
812 struct child_process format_patch = CHILD_PROCESS_INIT;
813 struct strbuf revisions = STRBUF_INIT;
814 int status;
815 char *rebased_patches;
816
817 am.git_cmd = 1;
818 strvec_push(&am.args, "am");
819
820 if (opts->action && !strcmp("continue", opts->action)) {
821 strvec_push(&am.args, "--resolved");
822 strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
823 if (opts->gpg_sign_opt)
824 strvec_push(&am.args, opts->gpg_sign_opt);
825 status = run_command(&am);
826 if (status)
827 return status;
828
829 return move_to_original_branch(opts);
830 }
831 if (opts->action && !strcmp("skip", opts->action)) {
832 strvec_push(&am.args, "--skip");
833 strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
834 status = run_command(&am);
835 if (status)
836 return status;
837
838 return move_to_original_branch(opts);
839 }
840 if (opts->action && !strcmp("show-current-patch", opts->action)) {
841 strvec_push(&am.args, "--show-current-patch");
842 return run_command(&am);
843 }
844
845 strbuf_addf(&revisions, "%s...%s",
846 oid_to_hex(opts->root ?
847 /* this is now equivalent to !opts->upstream */
848 &opts->onto->object.oid :
849 &opts->upstream->object.oid),
850 oid_to_hex(&opts->orig_head));
851
852 rebased_patches = xstrdup(git_path("rebased-patches"));
853 format_patch.out = open(rebased_patches,
854 O_WRONLY | O_CREAT | O_TRUNC, 0666);
855 if (format_patch.out < 0) {
856 status = error_errno(_("could not open '%s' for writing"),
857 rebased_patches);
858 free(rebased_patches);
859 strvec_clear(&am.args);
860 return status;
861 }
862
863 format_patch.git_cmd = 1;
864 strvec_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
865 "--full-index", "--cherry-pick", "--right-only",
866 "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
867 "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
868 "--no-base", NULL);
869 if (opts->git_format_patch_opt.len)
870 strvec_split(&format_patch.args,
871 opts->git_format_patch_opt.buf);
872 strvec_push(&format_patch.args, revisions.buf);
873 if (opts->restrict_revision)
874 strvec_pushf(&format_patch.args, "^%s",
875 oid_to_hex(&opts->restrict_revision->object.oid));
876
877 status = run_command(&format_patch);
878 if (status) {
879 unlink(rebased_patches);
880 free(rebased_patches);
881 strvec_clear(&am.args);
882
883 reset_head(the_repository, &opts->orig_head, "checkout",
884 opts->head_name, 0,
885 "HEAD", NULL, DEFAULT_REFLOG_ACTION);
886 error(_("\ngit encountered an error while preparing the "
887 "patches to replay\n"
888 "these revisions:\n"
889 "\n %s\n\n"
890 "As a result, git cannot rebase them."),
891 opts->revisions);
892
893 strbuf_release(&revisions);
894 return status;
895 }
896 strbuf_release(&revisions);
897
898 am.in = open(rebased_patches, O_RDONLY);
899 if (am.in < 0) {
900 status = error_errno(_("could not open '%s' for reading"),
901 rebased_patches);
902 free(rebased_patches);
903 strvec_clear(&am.args);
904 return status;
905 }
906
907 strvec_pushv(&am.args, opts->git_am_opts.v);
908 strvec_push(&am.args, "--rebasing");
909 strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
910 strvec_push(&am.args, "--patch-format=mboxrd");
911 if (opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE)
912 strvec_push(&am.args, "--rerere-autoupdate");
913 else if (opts->allow_rerere_autoupdate == RERERE_NOAUTOUPDATE)
914 strvec_push(&am.args, "--no-rerere-autoupdate");
915 if (opts->gpg_sign_opt)
916 strvec_push(&am.args, opts->gpg_sign_opt);
917 status = run_command(&am);
918 unlink(rebased_patches);
919 free(rebased_patches);
920
921 if (!status) {
922 return move_to_original_branch(opts);
923 }
924
925 if (is_directory(opts->state_dir))
926 rebase_write_basic_state(opts);
927
928 return status;
929 }
930
931 static int run_specific_rebase(struct rebase_options *opts, enum action action)
932 {
933 const char *argv[] = { NULL, NULL };
934 struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
935 int status;
936 const char *backend, *backend_func;
937
938 if (opts->type == REBASE_MERGE) {
939 /* Run sequencer-based rebase */
940 setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1);
941 if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
942 setenv("GIT_SEQUENCE_EDITOR", ":", 1);
943 opts->autosquash = 0;
944 }
945 if (opts->gpg_sign_opt) {
946 /* remove the leading "-S" */
947 char *tmp = xstrdup(opts->gpg_sign_opt + 2);
948 free(opts->gpg_sign_opt);
949 opts->gpg_sign_opt = tmp;
950 }
951
952 status = run_sequencer_rebase(opts, action);
953 goto finished_rebase;
954 }
955
956 if (opts->type == REBASE_APPLY) {
957 status = run_am(opts);
958 goto finished_rebase;
959 }
960
961 add_var(&script_snippet, "GIT_DIR", absolute_path(get_git_dir()));
962 add_var(&script_snippet, "state_dir", opts->state_dir);
963
964 add_var(&script_snippet, "upstream_name", opts->upstream_name);
965 add_var(&script_snippet, "upstream", opts->upstream ?
966 oid_to_hex(&opts->upstream->object.oid) : NULL);
967 add_var(&script_snippet, "head_name",
968 opts->head_name ? opts->head_name : "detached HEAD");
969 add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
970 add_var(&script_snippet, "onto", opts->onto ?
971 oid_to_hex(&opts->onto->object.oid) : NULL);
972 add_var(&script_snippet, "onto_name", opts->onto_name);
973 add_var(&script_snippet, "revisions", opts->revisions);
974 add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
975 oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
976 sq_quote_argv_pretty(&buf, opts->git_am_opts.v);
977 add_var(&script_snippet, "git_am_opt", buf.buf);
978 strbuf_release(&buf);
979 add_var(&script_snippet, "verbose",
980 opts->flags & REBASE_VERBOSE ? "t" : "");
981 add_var(&script_snippet, "diffstat",
982 opts->flags & REBASE_DIFFSTAT ? "t" : "");
983 add_var(&script_snippet, "force_rebase",
984 opts->flags & REBASE_FORCE ? "t" : "");
985 if (opts->switch_to)
986 add_var(&script_snippet, "switch_to", opts->switch_to);
987 add_var(&script_snippet, "action", opts->action ? opts->action : "");
988 add_var(&script_snippet, "signoff", opts->signoff ? "--signoff" : "");
989 add_var(&script_snippet, "allow_rerere_autoupdate",
990 opts->allow_rerere_autoupdate ?
991 opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
992 "--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
993 add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
994 add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
995 add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
996 add_var(&script_snippet, "cmd", opts->cmd);
997 add_var(&script_snippet, "allow_empty_message",
998 opts->allow_empty_message ? "--allow-empty-message" : "");
999 add_var(&script_snippet, "rebase_merges",
1000 opts->rebase_merges ? "t" : "");
1001 add_var(&script_snippet, "rebase_cousins",
1002 opts->rebase_cousins ? "t" : "");
1003 add_var(&script_snippet, "strategy", opts->strategy);
1004 add_var(&script_snippet, "strategy_opts", opts->strategy_opts);
1005 add_var(&script_snippet, "rebase_root", opts->root ? "t" : "");
1006 add_var(&script_snippet, "squash_onto",
1007 opts->squash_onto ? oid_to_hex(opts->squash_onto) : "");
1008 add_var(&script_snippet, "git_format_patch_opt",
1009 opts->git_format_patch_opt.buf);
1010
1011 if (is_merge(opts) &&
1012 !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
1013 strbuf_addstr(&script_snippet,
1014 "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
1015 opts->autosquash = 0;
1016 }
1017
1018 switch (opts->type) {
1019 case REBASE_PRESERVE_MERGES:
1020 backend = "git-rebase--preserve-merges";
1021 backend_func = "git_rebase__preserve_merges";
1022 break;
1023 default:
1024 BUG("Unhandled rebase type %d", opts->type);
1025 break;
1026 }
1027
1028 strbuf_addf(&script_snippet,
1029 ". git-sh-setup && . %s && %s", backend, backend_func);
1030 argv[0] = script_snippet.buf;
1031
1032 status = run_command_v_opt(argv, RUN_USING_SHELL);
1033 finished_rebase:
1034 if (opts->dont_finish_rebase)
1035 ; /* do nothing */
1036 else if (opts->type == REBASE_MERGE)
1037 ; /* merge backend cleans up after itself */
1038 else if (status == 0) {
1039 if (!file_exists(state_dir_path("stopped-sha", opts)))
1040 finish_rebase(opts);
1041 } else if (status == 2) {
1042 struct strbuf dir = STRBUF_INIT;
1043
1044 apply_autostash(state_dir_path("autostash", opts));
1045 strbuf_addstr(&dir, opts->state_dir);
1046 remove_dir_recursively(&dir, 0);
1047 strbuf_release(&dir);
1048 die("Nothing to do");
1049 }
1050
1051 strbuf_release(&script_snippet);
1052
1053 return status ? -1 : 0;
1054 }
1055
1056 static int rebase_config(const char *var, const char *value, void *data)
1057 {
1058 struct rebase_options *opts = data;
1059
1060 if (!strcmp(var, "rebase.stat")) {
1061 if (git_config_bool(var, value))
1062 opts->flags |= REBASE_DIFFSTAT;
1063 else
1064 opts->flags &= ~REBASE_DIFFSTAT;
1065 return 0;
1066 }
1067
1068 if (!strcmp(var, "rebase.autosquash")) {
1069 opts->autosquash = git_config_bool(var, value);
1070 return 0;
1071 }
1072
1073 if (!strcmp(var, "commit.gpgsign")) {
1074 free(opts->gpg_sign_opt);
1075 opts->gpg_sign_opt = git_config_bool(var, value) ?
1076 xstrdup("-S") : NULL;
1077 return 0;
1078 }
1079
1080 if (!strcmp(var, "rebase.autostash")) {
1081 opts->autostash = git_config_bool(var, value);
1082 return 0;
1083 }
1084
1085 if (!strcmp(var, "rebase.reschedulefailedexec")) {
1086 opts->reschedule_failed_exec = git_config_bool(var, value);
1087 return 0;
1088 }
1089
1090 if (!strcmp(var, "rebase.forkpoint")) {
1091 opts->fork_point = git_config_bool(var, value) ? -1 : 0;
1092 return 0;
1093 }
1094
1095 if (!strcmp(var, "rebase.backend")) {
1096 return git_config_string(&opts->default_backend, var, value);
1097 }
1098
1099 return git_default_config(var, value, data);
1100 }
1101
1102 /*
1103 * Determines whether the commits in from..to are linear, i.e. contain
1104 * no merge commits. This function *expects* `from` to be an ancestor of
1105 * `to`.
1106 */
1107 static int is_linear_history(struct commit *from, struct commit *to)
1108 {
1109 while (to && to != from) {
1110 parse_commit(to);
1111 if (!to->parents)
1112 return 1;
1113 if (to->parents->next)
1114 return 0;
1115 to = to->parents->item;
1116 }
1117 return 1;
1118 }
1119
1120 static int can_fast_forward(struct commit *onto, struct commit *upstream,
1121 struct commit *restrict_revision,
1122 struct object_id *head_oid, struct object_id *merge_base)
1123 {
1124 struct commit *head = lookup_commit(the_repository, head_oid);
1125 struct commit_list *merge_bases = NULL;
1126 int res = 0;
1127
1128 if (!head)
1129 goto done;
1130
1131 merge_bases = get_merge_bases(onto, head);
1132 if (!merge_bases || merge_bases->next) {
1133 oidcpy(merge_base, null_oid());
1134 goto done;
1135 }
1136
1137 oidcpy(merge_base, &merge_bases->item->object.oid);
1138 if (!oideq(merge_base, &onto->object.oid))
1139 goto done;
1140
1141 if (restrict_revision && !oideq(&restrict_revision->object.oid, merge_base))
1142 goto done;
1143
1144 if (!upstream)
1145 goto done;
1146
1147 free_commit_list(merge_bases);
1148 merge_bases = get_merge_bases(upstream, head);
1149 if (!merge_bases || merge_bases->next)
1150 goto done;
1151
1152 if (!oideq(&onto->object.oid, &merge_bases->item->object.oid))
1153 goto done;
1154
1155 res = 1;
1156
1157 done:
1158 free_commit_list(merge_bases);
1159 return res && is_linear_history(onto, head);
1160 }
1161
1162 static int parse_opt_am(const struct option *opt, const char *arg, int unset)
1163 {
1164 struct rebase_options *opts = opt->value;
1165
1166 BUG_ON_OPT_NEG(unset);
1167 BUG_ON_OPT_ARG(arg);
1168
1169 opts->type = REBASE_APPLY;
1170
1171 return 0;
1172 }
1173
1174 /* -i followed by -m is still -i */
1175 static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
1176 {
1177 struct rebase_options *opts = opt->value;
1178
1179 BUG_ON_OPT_NEG(unset);
1180 BUG_ON_OPT_ARG(arg);
1181
1182 if (!is_merge(opts))
1183 opts->type = REBASE_MERGE;
1184
1185 return 0;
1186 }
1187
1188 /* -i followed by -p is still explicitly interactive, but -p alone is not */
1189 static int parse_opt_interactive(const struct option *opt, const char *arg,
1190 int unset)
1191 {
1192 struct rebase_options *opts = opt->value;
1193
1194 BUG_ON_OPT_NEG(unset);
1195 BUG_ON_OPT_ARG(arg);
1196
1197 opts->type = REBASE_MERGE;
1198 opts->flags |= REBASE_INTERACTIVE_EXPLICIT;
1199
1200 return 0;
1201 }
1202
1203 static enum empty_type parse_empty_value(const char *value)
1204 {
1205 if (!strcasecmp(value, "drop"))
1206 return EMPTY_DROP;
1207 else if (!strcasecmp(value, "keep"))
1208 return EMPTY_KEEP;
1209 else if (!strcasecmp(value, "ask"))
1210 return EMPTY_ASK;
1211
1212 die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value);
1213 }
1214
1215 static int parse_opt_empty(const struct option *opt, const char *arg, int unset)
1216 {
1217 struct rebase_options *options = opt->value;
1218 enum empty_type value = parse_empty_value(arg);
1219
1220 BUG_ON_OPT_NEG(unset);
1221
1222 options->empty = value;
1223 return 0;
1224 }
1225
1226 static void NORETURN error_on_missing_default_upstream(void)
1227 {
1228 struct branch *current_branch = branch_get(NULL);
1229
1230 printf(_("%s\n"
1231 "Please specify which branch you want to rebase against.\n"
1232 "See git-rebase(1) for details.\n"
1233 "\n"
1234 " git rebase '<branch>'\n"
1235 "\n"),
1236 current_branch ? _("There is no tracking information for "
1237 "the current branch.") :
1238 _("You are not currently on a branch."));
1239
1240 if (current_branch) {
1241 const char *remote = current_branch->remote_name;
1242
1243 if (!remote)
1244 remote = _("<remote>");
1245
1246 printf(_("If you wish to set tracking information for this "
1247 "branch you can do so with:\n"
1248 "\n"
1249 " git branch --set-upstream-to=%s/<branch> %s\n"
1250 "\n"),
1251 remote, current_branch->name);
1252 }
1253 exit(1);
1254 }
1255
1256 static void set_reflog_action(struct rebase_options *options)
1257 {
1258 const char *env;
1259 struct strbuf buf = STRBUF_INIT;
1260
1261 if (!is_merge(options))
1262 return;
1263
1264 env = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
1265 if (env && strcmp("rebase", env))
1266 return; /* only override it if it is "rebase" */
1267
1268 strbuf_addf(&buf, "rebase (%s)", options->action);
1269 setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1);
1270 strbuf_release(&buf);
1271 }
1272
1273 static int check_exec_cmd(const char *cmd)
1274 {
1275 if (strchr(cmd, '\n'))
1276 return error(_("exec commands cannot contain newlines"));
1277
1278 /* Does the command consist purely of whitespace? */
1279 if (!cmd[strspn(cmd, " \t\r\f\v")])
1280 return error(_("empty exec command"));
1281
1282 return 0;
1283 }
1284
1285 int cmd_rebase(int argc, const char **argv, const char *prefix)
1286 {
1287 struct rebase_options options = REBASE_OPTIONS_INIT;
1288 const char *branch_name;
1289 int ret, flags, total_argc, in_progress = 0;
1290 int keep_base = 0;
1291 int ok_to_skip_pre_rebase = 0;
1292 struct strbuf msg = STRBUF_INIT;
1293 struct strbuf revisions = STRBUF_INIT;
1294 struct strbuf buf = STRBUF_INIT;
1295 struct object_id merge_base;
1296 int ignore_whitespace = 0;
1297 enum action action = ACTION_NONE;
1298 const char *gpg_sign = NULL;
1299 struct string_list exec = STRING_LIST_INIT_NODUP;
1300 const char *rebase_merges = NULL;
1301 struct string_list strategy_options = STRING_LIST_INIT_NODUP;
1302 struct object_id squash_onto;
1303 char *squash_onto_name = NULL;
1304 int reschedule_failed_exec = -1;
1305 int allow_preemptive_ff = 1;
1306 struct option builtin_rebase_options[] = {
1307 OPT_STRING(0, "onto", &options.onto_name,
1308 N_("revision"),
1309 N_("rebase onto given branch instead of upstream")),
1310 OPT_BOOL(0, "keep-base", &keep_base,
1311 N_("use the merge-base of upstream and branch as the current base")),
1312 OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase,
1313 N_("allow pre-rebase hook to run")),
1314 OPT_NEGBIT('q', "quiet", &options.flags,
1315 N_("be quiet. implies --no-stat"),
1316 REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
1317 OPT_BIT('v', "verbose", &options.flags,
1318 N_("display a diffstat of what changed upstream"),
1319 REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
1320 {OPTION_NEGBIT, 'n', "no-stat", &options.flags, NULL,
1321 N_("do not show diffstat of what changed upstream"),
1322 PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
1323 OPT_BOOL(0, "signoff", &options.signoff,
1324 N_("add a Signed-off-by trailer to each commit")),
1325 OPT_BOOL(0, "committer-date-is-author-date",
1326 &options.committer_date_is_author_date,
1327 N_("make committer date match author date")),
1328 OPT_BOOL(0, "reset-author-date", &options.ignore_date,
1329 N_("ignore author date and use current date")),
1330 OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date,
1331 N_("synonym of --reset-author-date")),
1332 OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
1333 N_("passed to 'git apply'"), 0),
1334 OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace,
1335 N_("ignore changes in whitespace")),
1336 OPT_PASSTHRU_ARGV(0, "whitespace", &options.git_am_opts,
1337 N_("action"), N_("passed to 'git apply'"), 0),
1338 OPT_BIT('f', "force-rebase", &options.flags,
1339 N_("cherry-pick all commits, even if unchanged"),
1340 REBASE_FORCE),
1341 OPT_BIT(0, "no-ff", &options.flags,
1342 N_("cherry-pick all commits, even if unchanged"),
1343 REBASE_FORCE),
1344 OPT_CMDMODE(0, "continue", &action, N_("continue"),
1345 ACTION_CONTINUE),
1346 OPT_CMDMODE(0, "skip", &action,
1347 N_("skip current patch and continue"), ACTION_SKIP),
1348 OPT_CMDMODE(0, "abort", &action,
1349 N_("abort and check out the original branch"),
1350 ACTION_ABORT),
1351 OPT_CMDMODE(0, "quit", &action,
1352 N_("abort but keep HEAD where it is"), ACTION_QUIT),
1353 OPT_CMDMODE(0, "edit-todo", &action, N_("edit the todo list "
1354 "during an interactive rebase"), ACTION_EDIT_TODO),
1355 OPT_CMDMODE(0, "show-current-patch", &action,
1356 N_("show the patch file being applied or merged"),
1357 ACTION_SHOW_CURRENT_PATCH),
1358 OPT_CALLBACK_F(0, "apply", &options, NULL,
1359 N_("use apply strategies to rebase"),
1360 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1361 parse_opt_am),
1362 OPT_CALLBACK_F('m', "merge", &options, NULL,
1363 N_("use merging strategies to rebase"),
1364 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1365 parse_opt_merge),
1366 OPT_CALLBACK_F('i', "interactive", &options, NULL,
1367 N_("let the user edit the list of commits to rebase"),
1368 PARSE_OPT_NOARG | PARSE_OPT_NONEG,
1369 parse_opt_interactive),
1370 OPT_SET_INT_F('p', "preserve-merges", &options.type,
1371 N_("(DEPRECATED) try to recreate merges instead of "
1372 "ignoring them"),
1373 REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
1374 OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
1375 OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
1376 N_("how to handle commits that become empty"),
1377 PARSE_OPT_NONEG, parse_opt_empty),
1378 OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
1379 N_("keep commits which start empty"),
1380 PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
1381 parse_opt_keep_empty),
1382 OPT_BOOL(0, "autosquash", &options.autosquash,
1383 N_("move commits that begin with "
1384 "squash!/fixup! under -i")),
1385 { OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
1386 N_("GPG-sign commits"),
1387 PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
1388 OPT_AUTOSTASH(&options.autostash),
1389 OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
1390 N_("add exec lines after each commit of the "
1391 "editable list")),
1392 OPT_BOOL_F(0, "allow-empty-message",
1393 &options.allow_empty_message,
1394 N_("allow rebasing commits with empty messages"),
1395 PARSE_OPT_HIDDEN),
1396 {OPTION_STRING, 'r', "rebase-merges", &rebase_merges,
1397 N_("mode"),
1398 N_("try to rebase merges instead of skipping them"),
1399 PARSE_OPT_OPTARG, NULL, (intptr_t)""},
1400 OPT_BOOL(0, "fork-point", &options.fork_point,
1401 N_("use 'merge-base --fork-point' to refine upstream")),
1402 OPT_STRING('s', "strategy", &options.strategy,
1403 N_("strategy"), N_("use the given merge strategy")),
1404 OPT_STRING_LIST('X', "strategy-option", &strategy_options,
1405 N_("option"),
1406 N_("pass the argument through to the merge "
1407 "strategy")),
1408 OPT_BOOL(0, "root", &options.root,
1409 N_("rebase all reachable commits up to the root(s)")),
1410 OPT_BOOL(0, "reschedule-failed-exec",
1411 &reschedule_failed_exec,
1412 N_("automatically re-schedule any `exec` that fails")),
1413 OPT_BOOL(0, "reapply-cherry-picks", &options.reapply_cherry_picks,
1414 N_("apply all changes, even those already present upstream")),
1415 OPT_END(),
1416 };
1417 int i;
1418
1419 if (argc == 2 && !strcmp(argv[1], "-h"))
1420 usage_with_options(builtin_rebase_usage,
1421 builtin_rebase_options);
1422
1423 options.allow_empty_message = 1;
1424 git_config(rebase_config, &options);
1425 /* options.gpg_sign_opt will be either "-S" or NULL */
1426 gpg_sign = options.gpg_sign_opt ? "" : NULL;
1427 FREE_AND_NULL(options.gpg_sign_opt);
1428
1429 strbuf_reset(&buf);
1430 strbuf_addf(&buf, "%s/applying", apply_dir());
1431 if(file_exists(buf.buf))
1432 die(_("It looks like 'git am' is in progress. Cannot rebase."));
1433
1434 if (is_directory(apply_dir())) {
1435 options.type = REBASE_APPLY;
1436 options.state_dir = apply_dir();
1437 } else if (is_directory(merge_dir())) {
1438 strbuf_reset(&buf);
1439 strbuf_addf(&buf, "%s/rewritten", merge_dir());
1440 if (is_directory(buf.buf)) {
1441 options.type = REBASE_PRESERVE_MERGES;
1442 options.flags |= REBASE_INTERACTIVE_EXPLICIT;
1443 } else {
1444 strbuf_reset(&buf);
1445 strbuf_addf(&buf, "%s/interactive", merge_dir());
1446 if(file_exists(buf.buf)) {
1447 options.type = REBASE_MERGE;
1448 options.flags |= REBASE_INTERACTIVE_EXPLICIT;
1449 } else
1450 options.type = REBASE_MERGE;
1451 }
1452 options.state_dir = merge_dir();
1453 }
1454
1455 if (options.type != REBASE_UNSPECIFIED)
1456 in_progress = 1;
1457
1458 total_argc = argc;
1459 argc = parse_options(argc, argv, prefix,
1460 builtin_rebase_options,
1461 builtin_rebase_usage, 0);
1462
1463 if (action != ACTION_NONE && total_argc != 2) {
1464 usage_with_options(builtin_rebase_usage,
1465 builtin_rebase_options);
1466 }
1467
1468 if (argc > 2)
1469 usage_with_options(builtin_rebase_usage,
1470 builtin_rebase_options);
1471
1472 if (options.type == REBASE_PRESERVE_MERGES)
1473 warning(_("git rebase --preserve-merges is deprecated. "
1474 "Use --rebase-merges instead."));
1475
1476 if (keep_base) {
1477 if (options.onto_name)
1478 die(_("cannot combine '--keep-base' with '--onto'"));
1479 if (options.root)
1480 die(_("cannot combine '--keep-base' with '--root'"));
1481 }
1482
1483 if (options.root && options.fork_point > 0)
1484 die(_("cannot combine '--root' with '--fork-point'"));
1485
1486 if (action != ACTION_NONE && !in_progress)
1487 die(_("No rebase in progress?"));
1488 setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
1489
1490 if (action == ACTION_EDIT_TODO && !is_merge(&options))
1491 die(_("The --edit-todo action can only be used during "
1492 "interactive rebase."));
1493
1494 if (trace2_is_enabled()) {
1495 if (is_merge(&options))
1496 trace2_cmd_mode("interactive");
1497 else if (exec.nr)
1498 trace2_cmd_mode("interactive-exec");
1499 else
1500 trace2_cmd_mode(action_names[action]);
1501 }
1502
1503 switch (action) {
1504 case ACTION_CONTINUE: {
1505 struct object_id head;
1506 struct lock_file lock_file = LOCK_INIT;
1507 int fd;
1508
1509 options.action = "continue";
1510 set_reflog_action(&options);
1511
1512 /* Sanity check */
1513 if (get_oid("HEAD", &head))
1514 die(_("Cannot read HEAD"));
1515
1516 fd = hold_locked_index(&lock_file, 0);
1517 if (repo_read_index(the_repository) < 0)
1518 die(_("could not read index"));
1519 refresh_index(the_repository->index, REFRESH_QUIET, NULL, NULL,
1520 NULL);
1521 if (0 <= fd)
1522 repo_update_index_if_able(the_repository, &lock_file);
1523 rollback_lock_file(&lock_file);
1524
1525 if (has_unstaged_changes(the_repository, 1)) {
1526 puts(_("You must edit all merge conflicts and then\n"
1527 "mark them as resolved using git add"));
1528 exit(1);
1529 }
1530 if (read_basic_state(&options))
1531 exit(1);
1532 goto run_rebase;
1533 }
1534 case ACTION_SKIP: {
1535 struct string_list merge_rr = STRING_LIST_INIT_DUP;
1536
1537 options.action = "skip";
1538 set_reflog_action(&options);
1539
1540 rerere_clear(the_repository, &merge_rr);
1541 string_list_clear(&merge_rr, 1);
1542
1543 if (reset_head(the_repository, NULL, "reset", NULL, RESET_HEAD_HARD,
1544 NULL, NULL, DEFAULT_REFLOG_ACTION) < 0)
1545 die(_("could not discard worktree changes"));
1546 remove_branch_state(the_repository, 0);
1547 if (read_basic_state(&options))
1548 exit(1);
1549 goto run_rebase;
1550 }
1551 case ACTION_ABORT: {
1552 struct string_list merge_rr = STRING_LIST_INIT_DUP;
1553 options.action = "abort";
1554 set_reflog_action(&options);
1555
1556 rerere_clear(the_repository, &merge_rr);
1557 string_list_clear(&merge_rr, 1);
1558
1559 if (read_basic_state(&options))
1560 exit(1);
1561 if (reset_head(the_repository, &options.orig_head, "reset",
1562 options.head_name, RESET_HEAD_HARD,
1563 NULL, NULL, DEFAULT_REFLOG_ACTION) < 0)
1564 die(_("could not move back to %s"),
1565 oid_to_hex(&options.orig_head));
1566 remove_branch_state(the_repository, 0);
1567 ret = finish_rebase(&options);
1568 goto cleanup;
1569 }
1570 case ACTION_QUIT: {
1571 save_autostash(state_dir_path("autostash", &options));
1572 if (options.type == REBASE_MERGE) {
1573 struct replay_opts replay = REPLAY_OPTS_INIT;
1574
1575 replay.action = REPLAY_INTERACTIVE_REBASE;
1576 ret = sequencer_remove_state(&replay);
1577 } else {
1578 strbuf_reset(&buf);
1579 strbuf_addstr(&buf, options.state_dir);
1580 ret = remove_dir_recursively(&buf, 0);
1581 if (ret)
1582 error(_("could not remove '%s'"),
1583 options.state_dir);
1584 }
1585 goto cleanup;
1586 }
1587 case ACTION_EDIT_TODO:
1588 options.action = "edit-todo";
1589 options.dont_finish_rebase = 1;
1590 goto run_rebase;
1591 case ACTION_SHOW_CURRENT_PATCH:
1592 options.action = "show-current-patch";
1593 options.dont_finish_rebase = 1;
1594 goto run_rebase;
1595 case ACTION_NONE:
1596 break;
1597 default:
1598 BUG("action: %d", action);
1599 }
1600
1601 /* Make sure no rebase is in progress */
1602 if (in_progress) {
1603 const char *last_slash = strrchr(options.state_dir, '/');
1604 const char *state_dir_base =
1605 last_slash ? last_slash + 1 : options.state_dir;
1606 const char *cmd_live_rebase =
1607 "git rebase (--continue | --abort | --skip)";
1608 strbuf_reset(&buf);
1609 strbuf_addf(&buf, "rm -fr \"%s\"", options.state_dir);
1610 die(_("It seems that there is already a %s directory, and\n"
1611 "I wonder if you are in the middle of another rebase. "
1612 "If that is the\n"
1613 "case, please try\n\t%s\n"
1614 "If that is not the case, please\n\t%s\n"
1615 "and run me again. I am stopping in case you still "
1616 "have something\n"
1617 "valuable there.\n"),
1618 state_dir_base, cmd_live_rebase, buf.buf);
1619 }
1620
1621 if ((options.flags & REBASE_INTERACTIVE_EXPLICIT) ||
1622 (action != ACTION_NONE) ||
1623 (exec.nr > 0) ||
1624 options.autosquash) {
1625 allow_preemptive_ff = 0;
1626 }
1627 if (options.committer_date_is_author_date || options.ignore_date)
1628 options.flags |= REBASE_FORCE;
1629
1630 for (i = 0; i < options.git_am_opts.nr; i++) {
1631 const char *option = options.git_am_opts.v[i], *p;
1632 if (!strcmp(option, "--whitespace=fix") ||
1633 !strcmp(option, "--whitespace=strip"))
1634 allow_preemptive_ff = 0;
1635 else if (skip_prefix(option, "-C", &p)) {
1636 while (*p)
1637 if (!isdigit(*(p++)))
1638 die(_("switch `C' expects a "
1639 "numerical value"));
1640 } else if (skip_prefix(option, "--whitespace=", &p)) {
1641 if (*p && strcmp(p, "warn") && strcmp(p, "nowarn") &&
1642 strcmp(p, "error") && strcmp(p, "error-all"))
1643 die("Invalid whitespace option: '%s'", p);
1644 }
1645 }
1646
1647 for (i = 0; i < exec.nr; i++)
1648 if (check_exec_cmd(exec.items[i].string))
1649 exit(1);
1650
1651 if (!(options.flags & REBASE_NO_QUIET))
1652 strvec_push(&options.git_am_opts, "-q");
1653
1654 if (options.empty != EMPTY_UNSPECIFIED)
1655 imply_merge(&options, "--empty");
1656
1657 if (options.reapply_cherry_picks)
1658 imply_merge(&options, "--reapply-cherry-picks");
1659
1660 if (gpg_sign)
1661 options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
1662
1663 if (exec.nr) {
1664 int i;
1665
1666 imply_merge(&options, "--exec");
1667
1668 strbuf_reset(&buf);
1669 for (i = 0; i < exec.nr; i++)
1670 strbuf_addf(&buf, "exec %s\n", exec.items[i].string);
1671 options.cmd = xstrdup(buf.buf);
1672 }
1673
1674 if (rebase_merges) {
1675 if (!*rebase_merges)
1676 ; /* default mode; do nothing */
1677 else if (!strcmp("rebase-cousins", rebase_merges))
1678 options.rebase_cousins = 1;
1679 else if (strcmp("no-rebase-cousins", rebase_merges))
1680 die(_("Unknown mode: %s"), rebase_merges);
1681 options.rebase_merges = 1;
1682 imply_merge(&options, "--rebase-merges");
1683 }
1684
1685 if (options.type == REBASE_APPLY) {
1686 if (ignore_whitespace)
1687 strvec_push(&options.git_am_opts,
1688 "--ignore-whitespace");
1689 if (options.committer_date_is_author_date)
1690 strvec_push(&options.git_am_opts,
1691 "--committer-date-is-author-date");
1692 if (options.ignore_date)
1693 strvec_push(&options.git_am_opts, "--ignore-date");
1694 } else {
1695 /* REBASE_MERGE and PRESERVE_MERGES */
1696 if (ignore_whitespace) {
1697 string_list_append(&strategy_options,
1698 "ignore-space-change");
1699 }
1700 }
1701
1702 if (strategy_options.nr) {
1703 int i;
1704
1705 if (!options.strategy)
1706 options.strategy = "ort";
1707
1708 strbuf_reset(&buf);
1709 for (i = 0; i < strategy_options.nr; i++)
1710 strbuf_addf(&buf, " --%s",
1711 strategy_options.items[i].string);
1712 options.strategy_opts = xstrdup(buf.buf);
1713 }
1714
1715 if (options.strategy) {
1716 options.strategy = xstrdup(options.strategy);
1717 switch (options.type) {
1718 case REBASE_APPLY:
1719 die(_("--strategy requires --merge or --interactive"));
1720 case REBASE_MERGE:
1721 case REBASE_PRESERVE_MERGES:
1722 /* compatible */
1723 break;
1724 case REBASE_UNSPECIFIED:
1725 options.type = REBASE_MERGE;
1726 break;
1727 default:
1728 BUG("unhandled rebase type (%d)", options.type);
1729 }
1730 }
1731
1732 if (options.type == REBASE_MERGE)
1733 imply_merge(&options, "--merge");
1734
1735 if (options.root && !options.onto_name)
1736 imply_merge(&options, "--root without --onto");
1737
1738 if (isatty(2) && options.flags & REBASE_NO_QUIET)
1739 strbuf_addstr(&options.git_format_patch_opt, " --progress");
1740
1741 if (options.git_am_opts.nr || options.type == REBASE_APPLY) {
1742 /* all am options except -q are compatible only with --apply */
1743 for (i = options.git_am_opts.nr - 1; i >= 0; i--)
1744 if (strcmp(options.git_am_opts.v[i], "-q"))
1745 break;
1746
1747 if (i >= 0) {
1748 if (is_merge(&options))
1749 die(_("cannot combine apply options with "
1750 "merge options"));
1751 else
1752 options.type = REBASE_APPLY;
1753 }
1754 }
1755
1756 if (options.type == REBASE_UNSPECIFIED) {
1757 if (!strcmp(options.default_backend, "merge"))
1758 imply_merge(&options, "--merge");
1759 else if (!strcmp(options.default_backend, "apply"))
1760 options.type = REBASE_APPLY;
1761 else
1762 die(_("Unknown rebase backend: %s"),
1763 options.default_backend);
1764 }
1765
1766 if (options.type == REBASE_MERGE &&
1767 !options.strategy &&
1768 getenv("GIT_TEST_MERGE_ALGORITHM"))
1769 options.strategy = xstrdup(getenv("GIT_TEST_MERGE_ALGORITHM"));
1770
1771 switch (options.type) {
1772 case REBASE_MERGE:
1773 case REBASE_PRESERVE_MERGES:
1774 options.state_dir = merge_dir();
1775 break;
1776 case REBASE_APPLY:
1777 options.state_dir = apply_dir();
1778 break;
1779 default:
1780 BUG("options.type was just set above; should be unreachable.");
1781 }
1782
1783 if (options.empty == EMPTY_UNSPECIFIED) {
1784 if (options.flags & REBASE_INTERACTIVE_EXPLICIT)
1785 options.empty = EMPTY_ASK;
1786 else if (exec.nr > 0)
1787 options.empty = EMPTY_KEEP;
1788 else
1789 options.empty = EMPTY_DROP;
1790 }
1791 if (reschedule_failed_exec > 0 && !is_merge(&options))
1792 die(_("--reschedule-failed-exec requires "
1793 "--exec or --interactive"));
1794 if (reschedule_failed_exec >= 0)
1795 options.reschedule_failed_exec = reschedule_failed_exec;
1796
1797 if (options.signoff) {
1798 if (options.type == REBASE_PRESERVE_MERGES)
1799 die("cannot combine '--signoff' with "
1800 "'--preserve-merges'");
1801 strvec_push(&options.git_am_opts, "--signoff");
1802 options.flags |= REBASE_FORCE;
1803 }
1804
1805 if (options.type == REBASE_PRESERVE_MERGES) {
1806 /*
1807 * Note: incompatibility with --signoff handled in signoff block above
1808 * Note: incompatibility with --interactive is just a strong warning;
1809 * git-rebase.txt caveats with "unless you know what you are doing"
1810 */
1811 if (options.rebase_merges)
1812 die(_("cannot combine '--preserve-merges' with "
1813 "'--rebase-merges'"));
1814
1815 if (options.reschedule_failed_exec)
1816 die(_("error: cannot combine '--preserve-merges' with "
1817 "'--reschedule-failed-exec'"));
1818 }
1819
1820 if (!options.root) {
1821 if (argc < 1) {
1822 struct branch *branch;
1823
1824 branch = branch_get(NULL);
1825 options.upstream_name = branch_get_upstream(branch,
1826 NULL);
1827 if (!options.upstream_name)
1828 error_on_missing_default_upstream();
1829 if (options.fork_point < 0)
1830 options.fork_point = 1;
1831 } else {
1832 options.upstream_name = argv[0];
1833 argc--;
1834 argv++;
1835 if (!strcmp(options.upstream_name, "-"))
1836 options.upstream_name = "@{-1}";
1837 }
1838 options.upstream =
1839 lookup_commit_reference_by_name(options.upstream_name);
1840 if (!options.upstream)
1841 die(_("invalid upstream '%s'"), options.upstream_name);
1842 options.upstream_arg = options.upstream_name;
1843 } else {
1844 if (!options.onto_name) {
1845 if (commit_tree("", 0, the_hash_algo->empty_tree, NULL,
1846 &squash_onto, NULL, NULL) < 0)
1847 die(_("Could not create new root commit"));
1848 options.squash_onto = &squash_onto;
1849 options.onto_name = squash_onto_name =
1850 xstrdup(oid_to_hex(&squash_onto));
1851 } else
1852 options.root_with_onto = 1;
1853
1854 options.upstream_name = NULL;
1855 options.upstream = NULL;
1856 if (argc > 1)
1857 usage_with_options(builtin_rebase_usage,
1858 builtin_rebase_options);
1859 options.upstream_arg = "--root";
1860 }
1861
1862 /* Make sure the branch to rebase onto is valid. */
1863 if (keep_base) {
1864 strbuf_reset(&buf);
1865 strbuf_addstr(&buf, options.upstream_name);
1866 strbuf_addstr(&buf, "...");
1867 options.onto_name = xstrdup(buf.buf);
1868 } else if (!options.onto_name)
1869 options.onto_name = options.upstream_name;
1870 if (strstr(options.onto_name, "...")) {
1871 if (get_oid_mb(options.onto_name, &merge_base) < 0) {
1872 if (keep_base)
1873 die(_("'%s': need exactly one merge base with branch"),
1874 options.upstream_name);
1875 else
1876 die(_("'%s': need exactly one merge base"),
1877 options.onto_name);
1878 }
1879 options.onto = lookup_commit_or_die(&merge_base,
1880 options.onto_name);
1881 } else {
1882 options.onto =
1883 lookup_commit_reference_by_name(options.onto_name);
1884 if (!options.onto)
1885 die(_("Does not point to a valid commit '%s'"),
1886 options.onto_name);
1887 }
1888
1889 /*
1890 * If the branch to rebase is given, that is the branch we will rebase
1891 * branch_name -- branch/commit being rebased, or
1892 * HEAD (already detached)
1893 * orig_head -- commit object name of tip of the branch before rebasing
1894 * head_name -- refs/heads/<that-branch> or NULL (detached HEAD)
1895 */
1896 if (argc == 1) {
1897 /* Is it "rebase other branchname" or "rebase other commit"? */
1898 branch_name = argv[0];
1899 options.switch_to = argv[0];
1900
1901 /* Is it a local branch? */
1902 strbuf_reset(&buf);
1903 strbuf_addf(&buf, "refs/heads/%s", branch_name);
1904 if (!read_ref(buf.buf, &options.orig_head)) {
1905 die_if_checked_out(buf.buf, 1);
1906 options.head_name = xstrdup(buf.buf);
1907 /* If not is it a valid ref (branch or commit)? */
1908 } else {
1909 struct commit *commit =
1910 lookup_commit_reference_by_name(branch_name);
1911 if (!commit)
1912 die(_("no such branch/commit '%s'"),
1913 branch_name);
1914 oidcpy(&options.orig_head, &commit->object.oid);
1915 options.head_name = NULL;
1916 }
1917 } else if (argc == 0) {
1918 /* Do not need to switch branches, we are already on it. */
1919 options.head_name =
1920 xstrdup_or_null(resolve_ref_unsafe("HEAD", 0, NULL,
1921 &flags));
1922 if (!options.head_name)
1923 die(_("No such ref: %s"), "HEAD");
1924 if (flags & REF_ISSYMREF) {
1925 if (!skip_prefix(options.head_name,
1926 "refs/heads/", &branch_name))
1927 branch_name = options.head_name;
1928
1929 } else {
1930 FREE_AND_NULL(options.head_name);
1931 branch_name = "HEAD";
1932 }
1933 if (get_oid("HEAD", &options.orig_head))
1934 die(_("Could not resolve HEAD to a revision"));
1935 } else
1936 BUG("unexpected number of arguments left to parse");
1937
1938 if (options.fork_point > 0) {
1939 struct commit *head =
1940 lookup_commit_reference(the_repository,
1941 &options.orig_head);
1942 options.restrict_revision =
1943 get_fork_point(options.upstream_name, head);
1944 }
1945
1946 if (repo_read_index(the_repository) < 0)
1947 die(_("could not read index"));
1948
1949 if (options.autostash) {
1950 create_autostash(the_repository, state_dir_path("autostash", &options),
1951 DEFAULT_REFLOG_ACTION);
1952 }
1953
1954 if (require_clean_work_tree(the_repository, "rebase",
1955 _("Please commit or stash them."), 1, 1)) {
1956 ret = -1;
1957 goto cleanup;
1958 }
1959
1960 /*
1961 * Now we are rebasing commits upstream..orig_head (or with --root,
1962 * everything leading up to orig_head) on top of onto.
1963 */
1964
1965 /*
1966 * Check if we are already based on onto with linear history,
1967 * in which case we could fast-forward without replacing the commits
1968 * with new commits recreated by replaying their changes.
1969 *
1970 * Note that can_fast_forward() initializes merge_base, so we have to
1971 * call it before checking allow_preemptive_ff.
1972 */
1973 if (can_fast_forward(options.onto, options.upstream, options.restrict_revision,
1974 &options.orig_head, &merge_base) &&
1975 allow_preemptive_ff) {
1976 int flag;
1977
1978 if (!(options.flags & REBASE_FORCE)) {
1979 /* Lazily switch to the target branch if needed... */
1980 if (options.switch_to) {
1981 strbuf_reset(&buf);
1982 strbuf_addf(&buf, "%s: checkout %s",
1983 getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
1984 options.switch_to);
1985 if (reset_head(the_repository,
1986 &options.orig_head, "checkout",
1987 options.head_name,
1988 RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
1989 NULL, buf.buf,
1990 DEFAULT_REFLOG_ACTION) < 0) {
1991 ret = error(_("could not switch to "
1992 "%s"),
1993 options.switch_to);
1994 goto cleanup;
1995 }
1996 }
1997
1998 if (!(options.flags & REBASE_NO_QUIET))
1999 ; /* be quiet */
2000 else if (!strcmp(branch_name, "HEAD") &&
2001 resolve_ref_unsafe("HEAD", 0, NULL, &flag))
2002 puts(_("HEAD is up to date."));
2003 else
2004 printf(_("Current branch %s is up to date.\n"),
2005 branch_name);
2006 ret = finish_rebase(&options);
2007 goto cleanup;
2008 } else if (!(options.flags & REBASE_NO_QUIET))
2009 ; /* be quiet */
2010 else if (!strcmp(branch_name, "HEAD") &&
2011 resolve_ref_unsafe("HEAD", 0, NULL, &flag))
2012 puts(_("HEAD is up to date, rebase forced."));
2013 else
2014 printf(_("Current branch %s is up to date, rebase "
2015 "forced.\n"), branch_name);
2016 }
2017
2018 /* If a hook exists, give it a chance to interrupt*/
2019 if (!ok_to_skip_pre_rebase &&
2020 run_hook_le(NULL, "pre-rebase", options.upstream_arg,
2021 argc ? argv[0] : NULL, NULL))
2022 die(_("The pre-rebase hook refused to rebase."));
2023
2024 if (options.flags & REBASE_DIFFSTAT) {
2025 struct diff_options opts;
2026
2027 if (options.flags & REBASE_VERBOSE) {
2028 if (is_null_oid(&merge_base))
2029 printf(_("Changes to %s:\n"),
2030 oid_to_hex(&options.onto->object.oid));
2031 else
2032 printf(_("Changes from %s to %s:\n"),
2033 oid_to_hex(&merge_base),
2034 oid_to_hex(&options.onto->object.oid));
2035 }
2036
2037 /* We want color (if set), but no pager */
2038 diff_setup(&opts);
2039 opts.stat_width = -1; /* use full terminal width */
2040 opts.stat_graph_width = -1; /* respect statGraphWidth config */
2041 opts.output_format |=
2042 DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
2043 opts.detect_rename = DIFF_DETECT_RENAME;
2044 diff_setup_done(&opts);
2045 diff_tree_oid(is_null_oid(&merge_base) ?
2046 the_hash_algo->empty_tree : &merge_base,
2047 &options.onto->object.oid, "", &opts);
2048 diffcore_std(&opts);
2049 diff_flush(&opts);
2050 }
2051
2052 if (is_merge(&options))
2053 goto run_rebase;
2054
2055 /* Detach HEAD and reset the tree */
2056 if (options.flags & REBASE_NO_QUIET)
2057 printf(_("First, rewinding head to replay your work on top of "
2058 "it...\n"));
2059
2060 strbuf_addf(&msg, "%s: checkout %s",
2061 getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
2062 if (reset_head(the_repository, &options.onto->object.oid, "checkout", NULL,
2063 RESET_HEAD_DETACH | RESET_ORIG_HEAD |
2064 RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
2065 NULL, msg.buf, DEFAULT_REFLOG_ACTION))
2066 die(_("Could not detach HEAD"));
2067 strbuf_release(&msg);
2068
2069 /*
2070 * If the onto is a proper descendant of the tip of the branch, then
2071 * we just fast-forwarded.
2072 */
2073 strbuf_reset(&msg);
2074 if (oideq(&merge_base, &options.orig_head)) {
2075 printf(_("Fast-forwarded %s to %s.\n"),
2076 branch_name, options.onto_name);
2077 strbuf_addf(&msg, "rebase finished: %s onto %s",
2078 options.head_name ? options.head_name : "detached HEAD",
2079 oid_to_hex(&options.onto->object.oid));
2080 reset_head(the_repository, NULL, "Fast-forwarded", options.head_name,
2081 RESET_HEAD_REFS_ONLY, "HEAD", msg.buf,
2082 DEFAULT_REFLOG_ACTION);
2083 strbuf_release(&msg);
2084 ret = finish_rebase(&options);
2085 goto cleanup;
2086 }
2087
2088 strbuf_addf(&revisions, "%s..%s",
2089 options.root ? oid_to_hex(&options.onto->object.oid) :
2090 (options.restrict_revision ?
2091 oid_to_hex(&options.restrict_revision->object.oid) :
2092 oid_to_hex(&options.upstream->object.oid)),
2093 oid_to_hex(&options.orig_head));
2094
2095 options.revisions = revisions.buf;
2096
2097 run_rebase:
2098 ret = run_specific_rebase(&options, action);
2099
2100 cleanup:
2101 strbuf_release(&buf);
2102 strbuf_release(&revisions);
2103 free(options.head_name);
2104 free(options.gpg_sign_opt);
2105 free(options.cmd);
2106 free(options.strategy);
2107 strbuf_release(&options.git_format_patch_opt);
2108 free(squash_onto_name);
2109 return !!ret;
2110 }
git for Debian