git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] rebase --skip: fix commit message clean up when skipping squash
Date: Mon, 07 Aug 2023 09:16:30 -0700	[thread overview]
Message-ID: <xmqqzg32hlpd.fsf@gitster.g> (raw)
In-Reply-To: <b43a5b46-f391-bd9e-4bf2-bfeaa3548f3e@gmail.com> (Phillip Wood's message of "Mon, 7 Aug 2023 10:59:41 +0100")

Phillip Wood <phillip.wood123@gmail.com> writes:

>> I am not sure if deviating from expect vs actual is such a good
>> idea.  It is not like use of two temporary files are transparent to
>> the caller of the new test helper---indeed, expect and actual are
>> likely to be used by the caller in tests that comes before or after
>> the ones that use test_commit_message, and by using a pair of files
>> that are different, the caller will now see two extra untracked
>> files left in the working tree.
>
> That's true, looking at test-lib-functions.sh it seems I unwittingly
> followed the example of test_cmp_config() which uses
> {actual,expect}.config when it calls test_cmp(). Anyway as this is in
> next I assume you're happy enough with the implementation as it
> stands.

You assumed too much ;-).  The above is a bad move, but is minor
enough and it is not a show-stopper.  If you are aware of other bad
examples, clean-up patches after the dust settles would be very much
welcomed.

Thanks.

  reply	other threads:[~2023-08-07 16:16 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-03 13:09 [PATCH] rebase --skip: fix commit message clean up when skipping squash Phillip Wood via GitGitGadget
2023-08-03 20:20 ` Junio C Hamano
2023-08-07  9:59   ` Phillip Wood
2023-08-07 16:16     ` Junio C Hamano [this message]
2023-08-03 20:38 ` Marc Branchaud
2023-08-07 10:00   ` 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=xmqqzg32hlpd.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    /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).