From: Junio C Hamano <gitster@pobox•com>
To: Lars Schneider <larsxschneider@gmail•com>
Cc: "Eric Sunshine" <sunshine@sunshineco•com>,
"Git List" <git@vger•kernel.org>,
"Luke Diamand" <luke@diamand•org>,
"Torsten Bögershausen" <tboegi@web•de>
Subject: Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error
Date: Mon, 21 Sep 2015 10:41:28 -0700 [thread overview]
Message-ID: <xmqqzj0facvr.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <4DB8A17D-A670-4E84-8FA8-9B05F2DCE1CB@gmail.com> (Lars Schneider's message of "Sun, 20 Sep 2015 23:34:23 +0200")
Lars Schneider <larsxschneider@gmail•com> writes:
> On 20 Sep 2015, at 23:16, Eric Sunshine <sunshine@sunshineco•com> wrote:
>
>> On Sun, Sep 20, 2015 at 12:22 PM, <larsxschneider@gmail•com> wrote:
>>> A P4 repository can get into a state where it contains a file with
>>> type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4
>>> attempts to retrieve the file then the process crashes with a
>>> "Translation of file content failed" error.
>>
>> Hmm, are these tests going to succeed only after patch 2/2 is applied?
>> If so, the order of these patches is backward since you want each
>> patch to be able to stand on its own and not introduce any sort of
>> breakage.
> Yes, these tests succeed only after 2/2. I think I saw this approach
> somewhere in the Git history. I thought it would ease the reviewing
> process: show the problem in the first commit, fix it in a subsequent
> commit.
> However, I understand your point as 1/2 would break the build.
>
> What is the preferred way by the Git community? Combine patch and test
> in one commit or a patch commit followed by a test commit? I would
> prefer to have everything in one commit.
A single patch is fine and usually preferable when the patch does
not span all over the tree.
next prev parent reply other threads:[~2015-09-21 17:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-20 16:22 [PATCH v3 0/2] git-p4: handle "Translation of file content failed" larsxschneider
2015-09-20 16:22 ` [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error larsxschneider
2015-09-20 21:16 ` Eric Sunshine
2015-09-20 21:34 ` Lars Schneider
2015-09-20 22:29 ` Eric Sunshine
2015-09-21 7:47 ` Luke Diamand
2015-09-21 17:41 ` Junio C Hamano [this message]
2015-09-21 7:49 ` Luke Diamand
2015-09-21 9:05 ` Lars Schneider
2015-09-21 9:14 ` Torsten Bögershausen
2015-09-21 17:43 ` Junio C Hamano
2015-09-20 16:22 ` [PATCH v3 2/2] git-p4: handle "Translation of file content failed" larsxschneider
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=xmqqzj0facvr.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=larsxschneider@gmail$(echo .)com \
--cc=luke@diamand$(echo .)org \
--cc=sunshine@sunshineco$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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