From patchwork Thu Aug 29 16:47:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Wijen X-Patchwork-Id: 11121887 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F69414E5 for ; Thu, 29 Aug 2019 16:48:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 566162077B for ; Thu, 29 Aug 2019 16:48:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727352AbfH2Qsd (ORCPT ); Thu, 29 Aug 2019 12:48:33 -0400 Received: from smtp01.domein-it.com ([92.48.232.141]:39463 "EHLO smtp01.domein-it.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726784AbfH2Qsd (ORCPT ); Thu, 29 Aug 2019 12:48:33 -0400 Received: by smtp01.domein-it.com (Postfix, from userid 1000) id 4E0D380A51A4; Thu, 29 Aug 2019 18:48:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on smtp01.domein-it.com X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=AWL,BAYES_40,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from ferret.domein-it.nl (unknown [92.48.232.148]) by smtp01.domein-it.com (Postfix) with ESMTP id 47A4780A51BF; Thu, 29 Aug 2019 18:48:02 +0200 (CEST) Received: from 80-112-22-40.cable.dynamic.v4.ziggo.nl ([80.112.22.40]:58842 helo=ben.local) by ferret.domein-it.nl with esmtpa (Exim 4.92) (envelope-from ) id 1i3Naa-0007BY-FS; Thu, 29 Aug 2019 18:48:00 +0200 From: Ben Wijen To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin , Pratik Karki , Phillip Wood , Eric Sunshine , =?utf-8?q?Szeder_G=C3=A1bor?= , Ben Wijen Subject: [PATCH v5 2/2] builtin/rebase.c: Remove pointless message Date: Thu, 29 Aug 2019 18:47:57 +0200 Message-Id: <20190829164757.7301-3-ben@wijen.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190829164757.7301-1-ben@wijen.net> References: <20190826164513.9102-1-ben@wijen.net> <20190829164757.7301-1-ben@wijen.net> MIME-Version: 1.0 X-Domein-IT-MailScanner-Information: Please contact the ISP for more information X-Domein-IT-MailScanner-ID: 1i3Naa-0007BY-FS X-Domein-IT-MailScanner: Not scanned: please contact your Internet E-Mail Service Provider for details X-Domein-IT-MailScanner-SpamCheck: X-Domein-IT-MailScanner-From: ben@wijen.net Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When doing 'git rebase --autostash ' 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 --- builtin/rebase.c | 17 +---------------- t/t3420-rebase-autostash.sh | 4 ---- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index b3b17669e3..118205e481 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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")); - } - - struct commit *head = - lookup_commit_reference(the_repository, &head_oid); argv_array_pushl(&stash.args, "stash", "create", "autostash", NULL); @@ -1995,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) diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 43685a5c8e..2421bc39f5 100755 --- 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) - 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 @@ -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) - HEAD is now at $(git rev-parse --short feature-branch) third commit 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) - 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 @@ -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) - 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.