From: Junio C Hamano <gitster@pobox.com>
To: Derrick Stolee <derrickstolee@github.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 4/6] sequencer: avoid empty lines after 'update-ref' instructions
Date: Wed, 05 Oct 2022 09:49:16 -0700 [thread overview]
Message-ID: <xmqqsfk2qkqb.fsf@gitster.g> (raw)
In-Reply-To: <fc887b02-191e-912a-bd15-1dc882ddf9dc@github.com> (Derrick Stolee's message of "Fri, 30 Sep 2022 13:18:30 -0400")
Derrick Stolee <derrickstolee@github.com> writes:
>> pick 29a79f8 two
>> pick 74bf293 three
>> # Ref refs/heads/branch3 checked out at '/tmp/test/WT'
>>
>> update-ref refs/heads/branch2
>>
>> update-ref refs/heads/branch1
>>
>> pick 5f59b82 four
>>
>> Eliminate those empty lines.
>
> After this change, I think the end result is this:
>
> pick 29a79f8 two
> pick 74bf293 three
> # Ref refs/heads/branch3 checked out at '/tmp/test/WT'
> update-ref refs/heads/branch2
> update-ref refs/heads/branch1
> pick 5f59b82 four
>
> Specifically, there is no whitespace break between the last
> 'update-ref' command and the next 'pick' command. Since the
> 'update-ref' commands likely correspond to chunks of changes,
> it would be nice to still have that whitespace remain. I
> agree that the whitespace between the comments and previous
> 'update-ref' commands is wasteful, but I'd rather leave the
> wasteful (and usually rare) whitespace than lose the helpful
> whitespace.
>
> There is precedent for this kind of whitespace when using
> '--rebase-merges'.
>
> If you can find a nice way to add a line of whitespace between
> these lines and the next instruction type, then I fully
> support this change.
Sounds like it is sensible to omit this step for now from this
series. Thanks.
next prev parent reply other threads:[~2022-10-05 16:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 14:09 [PATCH 0/6] rebase --update-refs: smooth out some rough edges SZEDER Gábor
2022-09-30 14:09 ` [PATCH 1/6] t2407-worktree-heads.sh: remove outdated loop SZEDER Gábor
2022-09-30 14:09 ` [PATCH 2/6] t3404-rebase-interactive: mark a test with REFFILES prereq SZEDER Gábor
2022-09-30 16:46 ` Ævar Arnfjörð Bjarmason
2022-10-05 16:45 ` Junio C Hamano
2022-09-30 14:09 ` [PATCH 3/6] rebase -i: emphasize that 'update-ref' expects a fully-qualified ref SZEDER Gábor
2022-09-30 14:09 ` [PATCH 4/6] sequencer: avoid empty lines after 'update-ref' instructions SZEDER Gábor
2022-09-30 17:18 ` Derrick Stolee
2022-10-05 16:49 ` Junio C Hamano [this message]
2022-09-30 14:09 ` [PATCH 5/6] sequencer: duplicate the result of resolve_ref_unsafe() SZEDER Gábor
2022-09-30 16:45 ` Ævar Arnfjörð Bjarmason
2022-09-30 16:51 ` Ævar Arnfjörð Bjarmason
2022-09-30 17:23 ` Derrick Stolee
2022-10-09 17:23 ` SZEDER Gábor
2022-09-30 14:09 ` [PATCH 6/6] sequencer: fail early if invalid ref is given to 'update-ref' instruction SZEDER Gábor
2022-09-30 17:09 ` Ævar Arnfjörð Bjarmason
2022-09-30 17:29 ` [PATCH 0/6] rebase --update-refs: smooth out some rough edges Derrick Stolee
2022-10-01 16:31 ` SZEDER Gábor
2022-10-01 16:53 ` Junio C Hamano
2022-10-05 17:14 ` 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=xmqqsfk2qkqb.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=szeder.dev@gmail.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).