git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Elijah Newren <newren@gmail.com>,
	Git Mailing List <git@vger.kernel.org>,
	ben.humphreys@atlassian.com,
	Ben Humphreys <behumphreys@atlassian.com>
Subject: Re: [PATCH v2] merge-recursive: restore accidentally dropped setting of path
Date: Tue, 04 Jun 2019 14:33:53 -0700	[thread overview]
Message-ID: <xmqqzhmxrq66.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190604210754.GT951@szeder.dev> ("SZEDER Gábor"'s message of "Tue, 4 Jun 2019 23:07:54 +0200")

SZEDER Gábor <szeder.dev@gmail.com> writes:

>> +		test_must_fail git merge-file \
>> +			-L "HEAD" \
>> +			-L "" \
>> +			-L "A^0" \
>> +			ours empty theirs &&
>> +		git hash-object b >actual &&
>> +		git hash-object ours >expect &&
>> +		test_cmp ours b
>
> Here, however, you only changed what test_cmp looks at, but still kept
> the two 'git hash-object' invocations, and their output will never be
> looked at.

Thanks for quickly responding to a problem report and coming up with
a solution with further polishing, all.



  reply	other threads:[~2019-06-04 21:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-03 20:23 [ANNOUNCE] Git v2.22.0-rc3 Junio C Hamano
2019-06-04  1:32 ` Ben Humphreys
2019-06-04  2:30   ` SZEDER Gábor
2019-06-04  7:26     ` [PATCH] merge-recursive: restore accidentally dropped setting of path Elijah Newren
2019-06-04  8:33       ` Ben Humphreys
2019-06-04 13:14       ` SZEDER Gábor
2019-06-04 20:14         ` Elijah Newren
2019-06-04 20:22       ` Elijah Newren
2019-06-04 20:27       ` [PATCH v2] " Elijah Newren
2019-06-04 21:07         ` SZEDER Gábor
2019-06-04 21:33           ` Junio C Hamano [this message]
2019-06-04 22:48           ` Elijah Newren
2019-06-04  1:47 ` [ANNOUNCE] Git v2.22.0-rc3 Bhaskar Chowdhury
2019-06-04 14:45 ` Git for Windows v2.22.0-rc3, was " Johannes Schindelin

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=xmqqzhmxrq66.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=behumphreys@atlassian.com \
    --cc=ben.humphreys@atlassian.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=szeder.dev@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).