From: Ben Wijen <ben@wijen.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Pratik Karki <predatoramigo@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Ben Wijen <ben@wijen.net>
Subject: [PATCH v4 1/1] rebase.c: make sure the active branch isn't moved when autostashing
Date: Mon, 26 Aug 2019 18:45:12 +0200 [thread overview]
Message-ID: <20190826164513.9102-1-ben@wijen.net> (raw)
In-Reply-To: <20190821182941.12674-1-ben@wijen.net>
Dscho's review got me thinking about the rationale behind the 'HEAD is now at...'
message.
A 'stash push' is followed by a 'reset -q' but since 'stash create autostash' is
not, we must do it ourselves. I guess the legacy implementation could have been
'reset --hard -q' which would have also prevented the 'HEAD is now at...' message.
Ofcourse I'm happy to reinstate the message, but I'm convinced it doesn't add
information, as with this commit the original branch is no longer moved and
- as before - the autostash is re-applied after the rebase, leaving nothing
to be guessed about.
Thank you,
Ben Wijen (1):
rebase.c: make sure the active branch isn't moved when autostashing
builtin/rebase.c | 18 ++++++------------
t/t3420-rebase-autostash.sh | 12 ++++++++----
2 files changed, 14 insertions(+), 16 deletions(-)
--
2.22.0
next prev parent reply other threads:[~2019-08-26 16:45 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-18 9:53 [PATCH 0/2] git rebase: Make sure upstream branch is left alone Ben Wijen
2019-08-18 9:53 ` [PATCH 1/2] t3420: never change upstream branch Ben Wijen
2019-08-19 21:55 ` Junio C Hamano
2019-08-20 8:58 ` Phillip Wood
2019-08-18 9:53 ` [PATCH 2/2] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-20 9:00 ` Phillip Wood
2019-08-20 19:53 ` Ben
2019-08-20 20:12 ` [PATCH v2 0/1] git rebase: Make sure upstream branch is left alone Ben Wijen
2019-08-20 20:12 ` [PATCH v2 1/1] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-20 20:24 ` Eric Sunshine
2019-08-20 20:58 ` Junio C Hamano
2019-08-21 18:29 ` [PATCH v3 0/1] rebase.c: make sure the active " Ben Wijen
2019-08-21 18:29 ` [PATCH v3 1/1] " Ben Wijen
2019-08-22 12:27 ` Johannes Schindelin
2019-08-22 15:49 ` Junio C Hamano
2019-08-26 16:45 ` Ben Wijen [this message]
2019-08-26 16:45 ` [PATCH v4 " Ben Wijen
2019-08-26 17:10 ` SZEDER Gábor
2019-08-28 12:56 ` Johannes Schindelin
2019-08-28 15:34 ` Junio C Hamano
2019-08-28 16:03 ` Junio C Hamano
2019-08-29 16:47 ` [PATCH v5 0/2] rebase.c: make sure current " Ben Wijen
2019-08-29 16:47 ` [PATCH v5 1/2] builtin/rebase.c: make sure the active " Ben Wijen
2019-08-29 16:47 ` [PATCH v5 2/2] builtin/rebase.c: Remove pointless message Ben Wijen
2019-08-30 15:16 ` [PATCH v6 0/2] rebase.c: make sure current branch isn't moved when autostashing Ben Wijen
2019-08-30 15:16 ` [PATCH v6 1/2] builtin/rebase.c: make sure the active " Ben Wijen
2019-08-30 20:15 ` Junio C Hamano
2019-08-31 7:17 ` Ben
2019-09-01 16:01 ` Junio C Hamano
2019-09-01 16:27 ` Ben
2019-09-02 17:33 ` Junio C Hamano
2019-08-30 15:16 ` [PATCH v6 2/2] builtin/rebase.c: Remove pointless message Ben Wijen
2019-08-30 20:16 ` Junio C Hamano
2019-08-31 7:17 ` Ben
2019-08-30 15:16 ` [PATCH " Ben Wijen
2019-08-19 9:26 ` [PATCH 0/2] git rebase: Make sure upstream branch is left alone Phillip Wood
2019-08-19 15:33 ` Ben
2019-08-19 18:21 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190826164513.9102-1-ben@wijen.net \
--to=ben@wijen.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood123@gmail.com \
--cc=predatoramigo@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).