From: Stefan Beller <sbeller@google.com>
To: Elijah Newren <newren@gmail.com>
Cc: git <git@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v9 29.50/30] t6046: testcases checking whether updates can be skipped in a merge
Date: Fri, 13 Apr 2018 14:03:03 -0700 [thread overview]
Message-ID: <CAGZ79kaWnyuQXr8bHjrKL2xs+h-DQL8hekGJX8-prW+JY8kwUw@mail.gmail.com> (raw)
In-Reply-To: <20180413195607.18091-3-newren@gmail.com>
On Fri, Apr 13, 2018 at 12:56 PM, Elijah Newren <newren@gmail.com> wrote:
> Add several tests checking whether updates can be skipped in a merge.
> Also add several similar testcases for where updates cannot be skipped in
> a merge to make sure that we skip if and only if we should.
>
> In particular:
>
> * Testcase 1a (particularly 1a-check-L) would have pointed out the
> problem Linus has been dealing with for year with his merges[1].
>
> * Testcase 2a (particularly 2a-check-L) would have pointed out the
> problem with my directory-rename-series before it broke master[2].
>
> * Testcases 3[ab] (particularly 3a-check-L) provide a simpler testcase
> than 12b of t6043 making that one easier to understand.
>
> * There are several complementary testcases to make sure we're not just
> fixing those particular issues while regressing in the opposite
> direction.
>
> [1] https://public-inbox.org/git/CA+55aFzLZ3UkG5svqZwSnhNk75=fXJRkvU1m_RHBG54NOoaZPA@mail.gmail.com/
> [2] https://public-inbox.org/git/xmqqmuya43cs.fsf@gitster-ct.c.googlers.com/
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
This is
Reviewed-by: Stefan Beller <sbeller@google.com>
> + test_tick &&
> + git commit -m "O" &&
minor nit: I think you can omit the test_tick before creating O
for each setup.
Stefan
next prev parent reply other threads:[~2018-04-13 21:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-11 7:19 [Git] recursive merge on 'master' severely broken? Junio C Hamano
2018-04-11 9:06 ` Junio C Hamano
2018-04-11 9:57 ` Junio C Hamano
2018-04-11 15:51 ` Elijah Newren
2018-04-12 1:37 ` Junio C Hamano
2018-04-13 19:56 ` [RFC PATCH v9 0/30] Add directory rename detection to git Elijah Newren
2018-04-13 19:56 ` [PATCH v9 29.25/30] merge-recursive: improve output precision around skipping updates Elijah Newren
2018-04-13 19:56 ` [PATCH v9 29.50/30] t6046: testcases checking whether updates can be skipped in a merge Elijah Newren
2018-04-13 21:03 ` Stefan Beller [this message]
2018-04-13 19:56 ` [PATCH v9 29.75/30] merge-recursive: Fix was_tracked() to quit lying with some renamed paths Elijah Newren
2018-04-16 0:37 ` Junio C Hamano
2018-04-16 21:21 ` Elijah Newren
2018-04-13 19:56 ` [PATCH v9 30/30] merge-recursive: fix check for skipability of working tree updates Elijah Newren
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=CAGZ79kaWnyuQXr8bHjrKL2xs+h-DQL8hekGJX8-prW+JY8kwUw@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=torvalds@linux-foundation.org \
/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).