builtin/rebase.c: Remove pointless message

When doing 'git rebase --autostash <upstream> <master>' with a dirty worktree
a 'HEAD is now at ...' message is emitted, which is pointless as it refers to
the old active branch which isn't actually moved.

This commit removes the 'HEAD is now at...' message.

Signed-off-by: Ben Wijen <ben@wijen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 0a2f9273ee4744b96bf751f87effaf9edb96b23f..118205e48167d0e02eda34b7449d9502bf0ae9e2 100644 (file)
--- 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;
                                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);
 
                        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);
                                    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"));
                                       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)
 
                        if (discard_index(the_repository->index) < 0 ||
                                repo_read_index(the_repository) < 0)

diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 1131e0016a76cb9627b12ec0eb7ee86cb05820f8..5f7e73cf83a267cd3dc74917c963352fe9a1856d 100755 (executable)
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -37,7 +37,6 @@ test_expect_success setup '
 create_expected_success_am () {
        cat >expected <<-EOF
        $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
 create_expected_success_am () {
        cat >expected <<-EOF
        $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)

-       HEAD is now at $(git rev-parse --short feature-branch) third commit

        First, rewinding head to replay your work on top of it...
        Applying: second commit
        Applying: third commit
        First, rewinding head to replay your work on top of it...
        Applying: second commit
        Applying: third commit


@@ -48,7 +47,6 @@ create_expected_success_am () {
 create_expected_success_interactive () {
        q_to_cr >expected <<-EOF
        $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
 create_expected_success_interactive () {
        q_to_cr >expected <<-EOF
        $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)

-       HEAD is now at $(git rev-parse --short feature-branch) third commit

        Applied autostash.
        Successfully rebased and updated refs/heads/rebased-feature-branch.
        EOF
        Applied autostash.
        Successfully rebased and updated refs/heads/rebased-feature-branch.
        EOF


@@ -57,7 +55,6 @@ create_expected_success_interactive () {
 create_expected_failure_am () {
        cat >expected <<-EOF
        $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
 create_expected_failure_am () {
        cat >expected <<-EOF
        $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)

-       HEAD is now at $(git rev-parse --short feature-branch) third commit

        First, rewinding head to replay your work on top of it...
        Applying: second commit
        Applying: third commit
        First, rewinding head to replay your work on top of it...
        Applying: second commit
        Applying: third commit


@@ -70,7 +67,6 @@ create_expected_failure_am () {
 create_expected_failure_interactive () {
        cat >expected <<-EOF
        $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
 create_expected_failure_interactive () {
        cat >expected <<-EOF
        $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)

-       HEAD is now at $(git rev-parse --short feature-branch) third commit

        Applying autostash resulted in conflicts.
        Your changes are safe in the stash.
        You can run "git stash pop" or "git stash drop" at any time.
        Applying autostash resulted in conflicts.
        Your changes are safe in the stash.
        You can run "git stash pop" or "git stash drop" at any time.