Ben Wijen <[email protected]> writes:
> @@ -1968,13 +1968,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 object_id head_oid;
> - if (get_oid("HEAD", &head_oid)) {
> - ret = error(_("could not determine HEAD
> revision"));
I think we saw die() in the previous one. This patch would not
apply on top of the result of applying 1/2.
I'll tentatively queue this instead on top of the corrected 1/2.
Thanks.
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 0a2f9273ee..118205e481 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1968,12 +1968,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 object_id head_oid;
- struct commit *head;
-
- if (get_oid("HEAD", &head_oid))
- die(_("could not determine HEAD revision"));
- head = lookup_commit_reference(the_repository,
&head_oid);
argv_array_pushl(&stash.args,
"stash", "create", "autostash", NULL);
@@ -1994,17 +1988,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)
