From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Ben Wijen <ben@wijen.net>,
git@vger.kernel.org, Pratik Karki <predatoramigo@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v3 1/1] rebase.c: make sure the active branch isn't moved when autostashing
Date: Thu, 22 Aug 2019 08:49:26 -0700 [thread overview]
Message-ID: <xmqqftltqjy1.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1908221418540.46@tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Thu, 22 Aug 2019 14:27:29 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> As with this commit the reset must never change the active branch,
>> the 'HEAD is now at ...' message has now been removed.
>
> Actually, I am not so sure that I like this change.
>
> Previously, users had a chance to figure out to which revision the
> worktree was reset, before switching the branch (because switching the
> branch we _do_, via `git checkout master`).
Hmph, that only happens when --autostash is in effect and actually
had created a stash, no? If your working tree is clean, or if you
did not pass --autostash, "HEAD is now at ..." is not reported.
I am not sure why that particular piece of information is only
useful in the case we actually created a stash and unnecessary if we
did not create a stash.
When we do not create a stash, the output starts from "First,
rewinding head to replay your work on top of it...", which sort of
gives a warm and fuzzy impression that it is reporting what it is
doing, but without giving the most useful information (i.e. what
"it" refers to).
Because I am all for preserving the existing behaviour as much as
possible when fixing real bugs, I would not strongly object to your
idea of resurrecting the message. But I am not sure if the existing
message was all that useful in the first place. I'd rather see
these messages that were only emitted when --autostash was given
removed first (like this patch does), and then the "First rewinding..."
message reworded to show where we rebuilt the history on top of.
Other than that, thanks for a good review, and thanks Ben for
working on this.
next prev parent reply other threads:[~2019-08-22 15:49 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 [this message]
2019-08-26 16:45 ` [PATCH v4 " Ben Wijen
2019-08-26 16:45 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqftltqjy1.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=ben@wijen.net \
--cc=git@vger.kernel.org \
--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.
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 NNTP newsgroup(s).