From: Maxime Coste <frrrwww@gmail.com>
To: Pete Wyckoff <pw@padd.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Fix git-p4 submit in non --prepare-p4-only mode
Date: Wed, 11 Jun 2014 14:06:58 +0100 [thread overview]
Message-ID: <20140611130658.GA29245@nekage> (raw)
In-Reply-To: <20140610223958.GA10049@padd.com>
On Tue, Jun 10, 2014 at 06:39:58PM -0400, Pete Wyckoff wrote:
> frrrwww@gmail.com wrote on Tue, 10 Jun 2014 13:14 +0100:
> > b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 broke git p4 submit, here
> > is a proper fix, including proper handling for windows end of lines.
>
> I guess we don't have test coverage for these cases? Is this
> something that should get put into a maintenance release, quickly?
We have test cases for that, however we need to create a link to git-p4.py
named git-p4 in order for them to work. I did not run the first patch through
the tests (see my previous email) because of that. Sorry about that.
> The fix looks good. It's surprising that none of the tests
> managed to add a file and trigger the failure.
>
> I'll ack this again, as it looks okay, but hope you ran all the
> unit tests successfully on your machine.
It works, only one test fail (detect copy), but this test already fails
with my two patches reverted.
This should be applied soon (or alternatively
b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 should be reverted) in master,
as in the current state git p4 submit will fail most of the time.
I'll send that with your ack to Junio.
Cheers,
Maxime Coste.
next prev parent reply other threads:[~2014-06-11 13:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-10 18:18 [PATCH] git-p4: Do not include diff in spec file when just preparing p4 Maxime Coste
2014-01-12 22:29 ` Pete Wyckoff
2014-01-13 12:10 ` Maxime Coste
2014-01-14 0:06 ` Pete Wyckoff
2014-05-24 1:39 ` Maxime Coste
2014-05-24 1:44 ` Maxime Coste
2014-05-24 13:52 ` Pete Wyckoff
2014-05-24 17:40 ` Maxime Coste
2014-06-10 12:14 ` [PATCH] Fix git-p4 submit in non --prepare-p4-only mode Maxime Coste
2014-06-10 22:39 ` Pete Wyckoff
2014-06-11 13:06 ` Maxime Coste [this message]
2014-06-11 13:36 ` Pete Wyckoff
2014-06-11 13:09 ` Maxime Coste
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=20140611130658.GA29245@nekage \
--to=frrrwww@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pw@padd.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.
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).