From: liam Beguin <liambeguin@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Philip Oakley <philipoakley@iee.org>,
phillip.wood@dunelm.org.uk
Subject: Re: [PATCH v4 03/10] rebase -i: remove useless indentation
Date: Fri, 26 May 2017 23:15:47 -0400 [thread overview]
Message-ID: <fcd7f363-9c71-8aae-a298-7698285f479a@gmail.com> (raw)
In-Reply-To: <CAGZ79kYeeCog03NHqqzZeb4Ya_m+jpQfzfG9Aa=rM5pxHpRCKQ@mail.gmail.com>
Hi Stefan,
On 26/05/17 01:50 PM, Stefan Beller wrote:
> On Thu, May 25, 2017 at 8:15 PM, Liam Beguin <liambeguin@gmail.com> wrote:
>> Hi Johannes,
>>
>> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>>> The commands used to be indented, and it is nice to look at, but when we
>>> transform the SHA-1s, the indentation is removed. So let's do away with it.
>>>
>>> For the moment, at least: when we will use the upcoming rebase--helper
>>> to transform the SHA-1s, we *will* keep the indentation and can
>>> reintroduce it. Yet, to be able to validate the rebase--helper against
>>> the output of the current shell script version, we need to remove the
>>> extra indentation.
>>>
>>> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>>> ---
>>> git-rebase--interactive.sh | 14 +++++++-------
>>> 1 file changed, 7 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>>> index 609e150d38f..c40b1fd1d2e 100644
>>> --- a/git-rebase--interactive.sh
>>> +++ b/git-rebase--interactive.sh
>>> @@ -155,13 +155,13 @@ reschedule_last_action () {
>>> append_todo_help () {
>>> gettext "
>>> Commands:
>>> - p, pick = use commit
>>> - r, reword = use commit, but edit the commit message
>>> - e, edit = use commit, but stop for amending
>>> - s, squash = use commit, but meld into previous commit
>>> - f, fixup = like \"squash\", but discard this commit's log message
>>> - x, exec = run command (the rest of the line) using shell
>>> - d, drop = remove commit
>>> +p, pick = use commit
>>> +r, reword = use commit, but edit the commit message
>>> +e, edit = use commit, but stop for amending
>>> +s, squash = use commit, but meld into previous commit
>>> +f, fixup = like \"squash\", but discard this commit's log message
>>> +x, exec = run command (the rest of the line) using shell
>>> +d, drop = remove commit
>>
>> do we also need to update all the translations since this is a `gettext`
>> function?
>
> Translations are handled separately, later before a release is done.
> Separation of skills. ;)
>
> As programming is quite complicated and involved we'd rather ask
> Johannes to only focus on the code in such a patch here and then later
> the translators will focus on getting the translation right. As the translation
> tools are sophisticated, they will likely give the previous translation such
> that the translators see that there is only a white space change.
Thanks for the clarification, I was wondering how this part was handled.
>
> But as the commit message hints at a later patch that will reintroduce the
> original indentation, maybe the translators won't even see that change?
>
> For more information on how the translations work in the git workflow,
> see 951ea7656e (Merge tag 'l10n-2.13.0-rnd2.1' of
> git://github.com/git-l10n/git-po, 2017-05-09) or see
> https://public-inbox.org/git/CANYiYbGfDXj4jJTcd3PpXqsDN-TwCC8Dm8B9Ov_3NaSzwsrCfg@mail.gmail.com/
>
Liam
next prev parent reply other threads:[~2017-05-27 3:24 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 16:22 [PATCH 0/9] The final building block for a faster rebase -i Johannes Schindelin
2016-09-02 16:23 ` [PATCH 1/9] rebase -i: generate the script via rebase--helper Johannes Schindelin
2016-09-02 16:23 ` [PATCH 2/9] rebase -i: remove useless indentation Johannes Schindelin
2016-09-02 16:23 ` [PATCH 3/9] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2016-09-02 16:23 ` [PATCH 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2016-09-02 20:56 ` Dennis Kaarsemaker
2016-09-03 7:01 ` Johannes Schindelin
2016-09-02 16:23 ` [PATCH 5/9] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2016-09-02 16:23 ` [PATCH 6/9] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2016-09-02 20:59 ` Dennis Kaarsemaker
2016-09-02 16:23 ` [PATCH 7/9] rebase -i: skip unnecessary picks using " Johannes Schindelin
2016-09-02 16:23 ` [PATCH 8/9] t3415: test fixup with wrapped oneline Johannes Schindelin
2016-09-02 16:23 ` [PATCH 9/9] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2016-09-03 18:03 ` Josh Triplett
2016-09-04 6:47 ` Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 0/9] The final building block for a faster rebase -i Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 1/9] rebase -i: generate the script via rebase--helper Johannes Schindelin
2017-04-26 10:45 ` Jeff King
2017-04-26 11:34 ` Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 2/9] rebase -i: remove useless indentation Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 3/9] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 5/9] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 6/9] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 7/9] rebase -i: skip unnecessary picks using " Johannes Schindelin
2017-04-26 10:55 ` Jeff King
2017-04-26 11:31 ` Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 8/9] t3415: test fixup with wrapped oneline Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 9/9] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2017-04-26 3:32 ` [PATCH v2 0/9] The final building block for a faster rebase -i Junio C Hamano
2017-04-26 11:59 ` [PATCH v3 " Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 1/9] rebase -i: generate the script via rebase--helper Johannes Schindelin
2017-04-27 4:31 ` Junio C Hamano
2017-04-27 14:18 ` Johannes Schindelin
2017-04-28 0:13 ` Junio C Hamano
2017-04-28 2:36 ` Junio C Hamano
2017-04-28 15:13 ` Johannes Schindelin
2017-05-01 3:11 ` Junio C Hamano
2017-05-01 11:47 ` Johannes Schindelin
2017-04-28 10:08 ` Phillip Wood
2017-04-28 19:22 ` Johannes Schindelin
2017-05-01 10:06 ` Phillip Wood
2017-05-01 11:58 ` Johannes Schindelin
2017-05-01 0:49 ` Junio C Hamano
2017-05-01 11:06 ` Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 2/9] rebase -i: remove useless indentation Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 3/9] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2017-04-27 5:00 ` Junio C Hamano
2017-04-27 6:47 ` Junio C Hamano
2017-04-27 21:44 ` Johannes Schindelin
2017-04-28 0:15 ` Junio C Hamano
2017-04-28 15:15 ` Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 5/9] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2017-04-27 5:05 ` Junio C Hamano
2017-04-27 22:01 ` Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 6/9] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2017-04-27 5:32 ` Junio C Hamano
2017-04-28 15:10 ` Johannes Schindelin
2017-04-26 12:00 ` [PATCH v3 7/9] rebase -i: skip unnecessary picks using " Johannes Schindelin
2017-04-26 12:00 ` [PATCH v3 8/9] t3415: test fixup with wrapped oneline Johannes Schindelin
2017-04-26 12:00 ` [PATCH v3 9/9] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2017-04-28 21:30 ` [PATCH v4 00/10] The final building block for a faster rebase -i Johannes Schindelin
2017-04-28 21:31 ` [PATCH v4 01/10] t3415: verify that an empty instructionFormat is handled as before Johannes Schindelin
2017-04-28 21:31 ` [PATCH v4 02/10] rebase -i: generate the script via rebase--helper Johannes Schindelin
2017-05-26 3:15 ` Liam Beguin
2017-05-29 10:59 ` Johannes Schindelin
2017-05-30 15:57 ` liam Beguin
2017-05-30 18:19 ` liam Beguin
2017-05-29 6:07 ` Junio C Hamano
2017-05-29 10:54 ` Johannes Schindelin
2017-05-30 4:57 ` Junio C Hamano
2017-05-30 14:59 ` Johannes Schindelin
2017-05-30 15:08 ` revision API design, was " Johannes Schindelin
2017-05-30 22:53 ` Junio C Hamano
2017-06-01 6:48 ` Junio C Hamano
2017-04-28 21:31 ` [PATCH v4 03/10] rebase -i: remove useless indentation Johannes Schindelin
2017-05-26 3:15 ` Liam Beguin
2017-05-26 17:50 ` Stefan Beller
2017-05-27 3:15 ` liam Beguin [this message]
2017-04-28 21:32 ` [PATCH v4 04/10] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 05/10] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2017-05-26 3:15 ` Liam Beguin
2017-05-29 11:20 ` Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 06/10] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 07/10] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 08/10] rebase -i: skip unnecessary picks using " Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 09/10] t3415: test fixup with wrapped oneline Johannes Schindelin
2017-04-28 21:33 ` [PATCH v4 10/10] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2017-05-26 3:16 ` Liam Beguin
2017-05-29 11:26 ` Johannes Schindelin
2017-05-26 3:15 ` [PATCH v4 00/10] The final building block for a faster rebase -i Liam Beguin
2017-05-27 16:23 ` René Scharfe
2017-05-29 10:51 ` Johannes Schindelin
2017-05-29 12:50 ` Ævar Arnfjörð Bjarmason
2017-05-30 15:44 ` Johannes Schindelin
2017-05-30 20:22 ` Ævar Arnfjörð Bjarmason
2017-05-31 18:46 ` Ævar Arnfjörð Bjarmason
2017-05-29 10:56 ` Johannes Schindelin
2017-05-29 8:30 ` 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=fcd7f363-9c71-8aae-a298-7698285f479a@gmail.com \
--to=liambeguin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=phillip.wood@dunelm.org.uk \
--cc=sbeller@google.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).