From: Junio C Hamano <gitster@pobox•com>
To: Phillip Wood <phillip.wood@talktalk•net>
Cc: Git Mailing List <git@vger•kernel.org>,
Philip Oakley <philipoakley@iee•org>,
Phillip Wood <phillip.wood@dunelm•org.uk>
Subject: Re: [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase
Date: Wed, 26 Jul 2017 14:56:40 -0700 [thread overview]
Message-ID: <xmqqa83qq2uf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqa83rrrdu.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 26 Jul 2017 11:21:17 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Phillip Wood <phillip.wood@talktalk•net> writes:
>
>> From: Phillip Wood <phillip.wood@dunelm•org.uk>
>>
>> These patches add an '--autostage' option (and corresponding config
>> variable) to 'rebase --continue' that will stage any unstaged changes
>> before continuing. This saves the user having to type 'git add' before
>> running 'git rebase --continue'.
>
> I wonder if this interacts with existing rerere.autoupdate
> configuration variable and if so how (i.e. would they conflict and
> fight with each other? would they work well together? would one of
> them make the other unnecessary?). In any case, they look closely
> related and perhaps should be named similarly.
>
> I even have a suspicion that they may be essentially doing the same
> thing.
>
> For a previous discussion, you start from here:
>
> https://public-inbox.org/git/7vej6xb4lr.fsf@gitster.siamese.dyndns.org/#t
>
> and for the context, look at the original post by Ingo, to which the
> above message is a response to.
>
> Thanks.
Hmph, this is interesting.
"git rebase" does take "--rerere-autoupdate" option from the command
line, and propagates it to a later invocation of "rebase --continue"
by storing the value to $state_dir/allow_rerere_autoupdate file and
reading the value from it. $allow_rerere_autoupdate shell variable
is used to hold the setting.
I'd expect that this variable to be used in invocations of "git am"
in git-rebase--am.sh; but that does not seem to be the case. I
wonder if this was once working but over time we broke the feature
without anybody noticing it, or if the support was added but not
completed and the feature was a no-op from the beginning?
next prev parent reply other threads:[~2017-07-26 21:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-26 10:27 [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase Phillip Wood
2017-07-26 10:27 ` [RFC PATCH 1/5] rebase --continue: add --autostage to stage unstaged changes Phillip Wood
2017-07-26 10:27 ` [RFC PATCH 2/5] rebase -i: improve --continue --autostage Phillip Wood
2017-07-26 10:27 ` [RFC PATCH 3/5] Unify rebase amend message when HEAD has changed Phillip Wood
2017-07-26 10:27 ` [RFC PATCH 4/5] Add tests for rebase --continue --autostage Phillip Wood
2017-07-26 10:27 ` [RFC PATCH 5/5] Add rebase.continue.autostage config setting Phillip Wood
2017-07-26 18:21 ` [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase Junio C Hamano
2017-07-26 21:56 ` Junio C Hamano [this message]
2017-07-26 22:12 ` Junio C Hamano
2017-07-27 10:36 ` Phillip Wood
2017-07-27 13:25 ` Phillip Wood
2017-07-27 15:24 ` Junio C Hamano
2017-08-21 10:32 ` Phillip Wood
2017-08-21 22:41 ` Junio C Hamano
2017-08-22 10:54 ` Phillip Wood
2017-08-22 15:54 ` Junio C Hamano
2017-08-24 13:25 ` Phillip Wood
2017-08-24 16:46 ` Junio C Hamano
2017-08-25 11:54 ` Phillip Wood
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=xmqqa83qq2uf.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=philipoakley@iee$(echo .)org \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=phillip.wood@talktalk$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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