git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Samuel Čavoj" <samuel@cavoj.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH v3 3/3] sequencer: pass explicit --no-gpg-sign to merge
Date: Sun, 18 Oct 2020 01:16:22 +0200	[thread overview]
Message-ID: <20201017231622.afi73e62dp4yjvk4@fastboi.localdomain> (raw)
In-Reply-To: <xmqq5z788osw.fsf@gitster.c.googlers.com>

Hi,

On 17.10.2020 15:34, Junio C Hamano wrote:
> Samuel Čavoj <samuel@cavoj.net> writes:
> 
> >> Now that we know that the root cause of the bug you fixed was
> >> because rebase rebase with the default merge strategy for two-head
> >> merges use separate codepaths from and all other rebases, I wonder
> >> if it is prudent to also test the same cases this series adds
> >> without giving "-s resolve".  That would exercise the other codepath
> >
> > I will leave that for someone else to tackle eventually.
> 
> We know that other codepath has been working even before this fix,
> but tests are not about showing off what we fixed, but are about
> making sure similar breakage won't be introduced by mistake in the
> future.  Leaving it "for someone", when we know what the problem is
> and how to solve it, is asking for the "evantually" not materialize
> forever.

I agree with that, don't take me wrong, but in general, people have
other things to do, than implement test cases only marginally related to
the inital patch they submitted.

Anyway, as it didn't take long in this case, I added them as patch 3/3
in v4.

> 
> > As the number of very similar test is slowly growing, do you think it is
> > worth copying (or making more generic) the test_rebase_gpg_sign for this
> > situation as well? We currently have 4 almost identical tests (counting
> > the new one you suggested for v4). Just a thought, as it is simpler to
> > just add it at this point. Thanks for the feedback.
> 
> That is a tough question.  Often, a generic test helper makes it too
> easy to do a full matrix of tests and encourages us to overdo it,
> which we probably would want to avoid.  I think what I've suggested
> so far is a bare minimum combination for code coverage.
> 
Alright, I will leave them as is.

Regards,
Samuel

  reply	other threads:[~2020-10-17 23:16 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-13 21:30 [PATCH v3 1/3] t3435: use `test_config` instead of `git config` Samuel Čavoj
2020-10-13 21:30 ` [PATCH v3 2/3] sequencer: fix gpg option passed to merge subcommand Samuel Čavoj
2020-10-15 16:47   ` Junio C Hamano
2020-10-13 21:30 ` [PATCH v3 3/3] sequencer: pass explicit --no-gpg-sign to merge Samuel Čavoj
2020-10-15 17:02   ` Junio C Hamano
2020-10-17 22:02     ` Samuel Čavoj
2020-10-17 22:34       ` Junio C Hamano
2020-10-17 23:16         ` Samuel Čavoj [this message]
2020-10-15 16:43 ` [PATCH v3 1/3] t3435: use `test_config` instead of `git config` 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=20201017231622.afi73e62dp4yjvk4@fastboi.localdomain \
    --to=samuel@cavoj.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood123@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).