From: Jeff King <peff@peff.net>
To: Michael J Gruber <git@grubix.eu>
Cc: git@vger.kernel.org, Ekelhart Jakob <jakob.ekelhart@fsw.at>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/3] t6010: test actual test output
Date: Thu, 14 Sep 2017 10:34:50 -0400 [thread overview]
Message-ID: <20170914143450.tmomqf2vs55tk3nz@sigill.intra.peff.net> (raw)
In-Reply-To: <80f7dcfaa9162dc795f8c072effea44fa83ea196.1505394278.git.git@grubix.eu>
On Thu, Sep 14, 2017 at 03:15:18PM +0200, Michael J Gruber wrote:
> 4f21454b55 ("merge-base: handle --fork-point without reflog",
> 2016-10-12) introduced a fix for merge-base --fork-point without reflog
> and a test. While that test is fine, it did not update expected nor actual
> output and tested that of the previous test instead.
Oops. The use of the existing "expect3" was intentional (the idea being
that we are repeating the identical step from the previous test with the
slight tweak of not having a reflog). But obviously failing to write to
"actual" at all was a mistake.
That said, I'm OK with reiterating the expected output.
-Peff
next prev parent reply other threads:[~2017-09-14 14:34 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <c76e76a4ef11480da9995b0bec5a70e1@SFSWW2K12EX02.intern.fsw.at>
2017-09-13 15:07 ` merge-base not working as expected when base is ahead Ekelhart Jakob
2017-09-14 8:09 ` Michael J Gruber
2017-09-14 13:15 ` [PATCH 0/3] merge-base --fork-point fixes Michael J Gruber
2017-09-14 13:15 ` [PATCH 1/3] t6010: test actual test output Michael J Gruber
2017-09-14 14:34 ` Jeff King [this message]
2017-09-15 10:01 ` Michael J Gruber
2017-09-15 11:20 ` Jeff King
2017-09-14 13:15 ` [PATCH 2/3] merge-base: return fork-point outside reflog Michael J Gruber
2017-09-15 2:48 ` Junio C Hamano
2017-09-15 9:59 ` Phillip Wood
2017-09-15 10:23 ` Michael J Gruber
2017-09-15 18:24 ` Junio C Hamano
2017-09-21 6:27 ` Junio C Hamano
2017-09-21 9:39 ` Michael J Gruber
2017-09-22 1:49 ` Junio C Hamano
2017-09-22 8:34 ` Michael J Gruber
2017-09-22 9:14 ` Junio C Hamano
2017-10-03 6:05 ` Junio C Hamano
2017-11-08 8:52 ` Ekelhart Jakob
2017-11-08 9:33 ` Michael J Gruber
2017-11-09 2:49 ` Junio C Hamano
2017-09-14 13:15 ` [PATCH 3/3] merge-base: find fork-point outside partial reflog Michael J Gruber
2017-09-14 14:37 ` Jeff King
2017-09-14 13:49 ` [PATCH 0/3] merge-base --fork-point fixes Johannes Schindelin
2017-09-14 14:38 ` Jeff King
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=20170914143450.tmomqf2vs55tk3nz@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jakob.ekelhart@fsw.at \
/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).