Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

[thirdparty/git.git] / builtin / rebase.c

diff --git a/builtin/rebase.c b/builtin/rebase.c
index f730b15a787e8fd119d0b4a1a9e87fd0b04d571e..e755087b0f1ebe11472ab4e4ef7165a4714e4e2f 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1471,9 +1471,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                        N_("let the user edit the list of commits to rebase"),
                        PARSE_OPT_NOARG | PARSE_OPT_NONEG,
                        parse_opt_interactive },
-               OPT_SET_INT('p', "preserve-merges", &options.type,
-                           N_("(DEPRECATED) try to recreate merges instead of "
-                              "ignoring them"), REBASE_PRESERVE_MERGES),
+               OPT_SET_INT_F('p', "preserve-merges", &options.type,
+                             N_("(DEPRECATED) try to recreate merges instead of "
+                                "ignoring them"),
+                             REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
                OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
                OPT_BOOL('k', "keep-empty", &options.keep_empty,
                         N_("preserve empty commits during rebase")),
@@ -2002,9 +2003,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                                state_dir_path("autostash", &options);
                        struct child_process stash = CHILD_PROCESS_INIT;
                        struct object_id oid;
-                       struct commit *head =
-                               lookup_commit_reference(the_repository,
-                                                       &options.orig_head);
 
                        argv_array_pushl(&stash.args,
                                         "stash", "create", "autostash", NULL);
@@ -2025,17 +2023,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                                    options.state_dir);
                        write_file(autostash, "%s", oid_to_hex(&oid));
                        printf(_("Created autostash: %s\n"), buf.buf);
-                       if (reset_head(&head->object.oid, "reset --hard",
+                       if (reset_head(NULL, "reset --hard",
                                       NULL, RESET_HEAD_HARD, NULL, NULL) < 0)
                                die(_("could not reset --hard"));
-                       printf(_("HEAD is now at %s"),
-                              find_unique_abbrev(&head->object.oid,
-                                                 DEFAULT_ABBREV));
-                       strbuf_reset(&buf);
-                       pp_commit_easy(CMIT_FMT_ONELINE, head, &buf);
-                       if (buf.len > 0)
-                               printf(" %s", buf.buf);
-                       putchar('\n');
 
                        if (discard_index(the_repository->index) < 0 ||
                                repo_read_index(the_repository) < 0)