From: Wink Saville <wink@saville.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [RFC PATCH v3 2/9] Call git_rebase__interactive from run_specific_rebase
Date: Thu, 22 Mar 2018 12:28:58 -0700 [thread overview]
Message-ID: <CAKk8isoL--f1gt_p5XZ99ybN+xts=0_AKBo52Ej=n3SMPoMq3A@mail.gmail.com> (raw)
In-Reply-To: <xmqqpo3wklt2.fsf@gitster-ct.c.googlers.com>
On Thu, Mar 22, 2018 at 11:27 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Wink Saville <wink@saville.com> writes:
>
>> Instead of indirectly invoking git_rebase__interactive this invokes
>> it directly after sourcing.
>>
>> Signed-off-by: Wink Saville <wink@saville.com>
>> ---
>> git-rebase--interactive.sh | 11 -----------
>> git-rebase.sh | 11 +++++++++--
>> 2 files changed, 9 insertions(+), 13 deletions(-)
>>
>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>> index 561e2660e..213d75f43 100644
>> --- a/git-rebase--interactive.sh
>> +++ b/git-rebase--interactive.sh
>> @@ -740,15 +740,6 @@ get_missing_commit_check_level () {
>> printf '%s' "$check_level" | tr 'A-Z' 'a-z'
>> }
>>
>> -# The whole contents of this file is run by dot-sourcing it from
>> -# inside a shell function. It used to be that "return"s we see
>> -# below were not inside any function, and expected to return
>> -# to the function that dot-sourced us.
>> -#
>> -# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
>> -# construct and continue to run the statements that follow such a "return".
>> -# As a work-around, we introduce an extra layer of a function
>> -# here, and immediately call it after defining it.
>
> We still enclose the whole thing (including the returns that are
> problematic for older FreeBSD shells) in a shell function, so it's
> not like we are dropping the workaround for these systems. It's
> just the caller of the function moved.
>
> I think the removal of this large comment is justifiable, but the
> structure still needs a bit of explanation, especially given that
> the caller in git-rebase.sh needs to treat this scriptlet a bit
> differently from others.
>
> If we were not in the (longer term) process of getting rid of
> git-rebase.sh, it might even make sense to port the same
> "dot-sourced scriptlet defines a shell function to be called, and
> the caller calls it after dot-sourcing it" pattern to other rebase
> backends, so that the calling side can be unified again to become
> something like:
>
> . git-rebase--$type
> git_rebase__$type
> ret=$?
I've gone with the above suggestion and added back some
of the header.
next prev parent reply other threads:[~2018-03-22 19:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 16:57 [RFC PATCH v3 0/9] rebase-interactive: Wink Saville
2018-03-22 16:57 ` [RFC PATCH v3 1/9] Simplify pick_on_preserving_merges Wink Saville
2018-03-22 16:57 ` [RFC PATCH v3 2/9] Call git_rebase__interactive from run_specific_rebase Wink Saville
2018-03-22 18:27 ` Junio C Hamano
2018-03-22 19:28 ` Wink Saville [this message]
2018-03-22 20:03 ` [RFC PATCH v3.1 2/9 2/2] rebase-interactive: Do not automatically run code Wink Saville
2018-03-22 20:46 ` Junio C Hamano
2018-03-22 22:45 ` Wink Saville
2018-03-23 2:06 ` Junio C Hamano
2018-03-22 16:57 ` [RFC PATCH v3 3/9] Indent function git_rebase__interactive Wink Saville
2018-03-23 17:43 ` Johannes Schindelin
2018-03-22 16:57 ` [RFC PATCH v3 4/9] Extract functions out of git_rebase__interactive Wink Saville
2018-03-22 16:57 ` [RFC PATCH v3 5/9] Use new functions in git_rebase__interactive Wink Saville
2018-03-23 17:42 ` Johannes Schindelin
2018-03-23 18:24 ` Junio C Hamano
2018-03-23 20:09 ` Wink Saville
2018-03-22 16:57 ` [RFC PATCH v3 6/9] Add and use git_rebase__interactive__preserve_merges Wink Saville
2018-03-22 16:57 ` [RFC PATCH v3 7/9] Remove unused code paths from git_rebase__interactive Wink Saville
2018-03-22 16:57 ` [RFC PATCH v3 8/9] Remove unused code paths from git_rebase__interactive__preserve_merges Wink Saville
2018-03-22 16:57 ` [RFC PATCH v3 9/9] Remove merges_option and a blank line Wink Saville
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='CAKk8isoL--f1gt_p5XZ99ybN+xts=0_AKBo52Ej=n3SMPoMq3A@mail.gmail.com' \
--to=wink@saville.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).