git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Stephen & Linda Smith <ischis2@cox.net>
Cc: git@vger.kernel.org
Subject: Re: How to handle patch series conflicts
Date: Tue, 09 Oct 2018 14:51:09 +0900	[thread overview]
Message-ID: <xmqqh8hvr7le.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <2206767.tHxkKBSiVS@thunderbird> (Stephen & Linda Smith's message of "Sun, 07 Oct 2018 18:28:38 -0700")

Stephen & Linda Smith <ischis2@cox.net> writes:

> Junio - I've been working this but would like your opinion on 7500, 7501 and 
> now 7510.     
>
> I note that the the commit tests have intermixed functionality.  An example is 
> signoff tests that are in the three tests I mentioned. 
>
> I've been tempted multiple times over the last week to just merge the tests 
> into a single script, but that doesn't seem right either.
>
> So would you prefer a single script?   Would you prefer me to move tests 
> around?

The scripts themselves having the same name that is no more specific
tha just "commit" does not bother _me_ personally too much.  If I
were doing it, unless you are an obsessive type that wants to see
spanking cleanness everywhere, I'd limit the changes to the minimum.

If something tested in script X is tested in another script Y and it
is trivial to see they are testing exactly the same thing, removing
one copy from script Y would be good, and if the remaining changes
in script Y becomes more focused with only such removals, that would
even be better, as at that point we can rename "tY-commit.sh" to
something more specific like "tY-commit-signature.sh".

  reply	other threads:[~2018-10-09  5:51 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-03 18:16 test files with same names? Duy Nguyen
2018-09-04 17:27 ` Junio C Hamano
2018-10-23  3:53   ` [PATCH 0/5] Commit test name clean-up Stephen P. Smith
2018-10-23  3:53   ` [PATCH 1/5] t2000: rename and combine checkout clash tests Stephen P. Smith
2018-10-23  3:53   ` [PATCH 2/5] t7509: cleanup description and filename Stephen P. Smith
2018-10-23  4:03     ` Eric Sunshine
2018-10-23  3:53   ` [PATCH 3/5] t7502: rename commit test script to comply with naming convention Stephen P. Smith
2018-10-23  3:53   ` [PATCH 4/5] t7500: rename commit tests " Stephen P. Smith
2018-10-23  4:05     ` Eric Sunshine
2018-10-23  3:53   ` [PATCH 5/5] t7501: rename commit test " Stephen P. Smith
2018-10-23  4:07     ` Eric Sunshine
2018-09-04 18:04 ` test files with same names? Stephen & Linda Smith
2018-09-05 17:25   ` How to handle patch series conflicts Stephen & Linda Smith
2018-09-05 17:27     ` Stefan Beller
2018-09-05 21:16     ` Junio C Hamano
2018-10-08  1:28       ` Stephen & Linda Smith
2018-10-09  5:51         ` Junio C Hamano [this message]
2018-10-09 13:11         ` Stephen Smith
2018-09-05 21:34     ` Stephen & Linda Smith
2018-09-05 22:03     ` Stephen & Linda Smith
2018-09-07  0:12     ` Stephen Smith

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=xmqqh8hvr7le.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=ischis2@cox.net \
    /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).