git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Luke Diamand <luke@diamand.org>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
	"Git mailing list" <git@vger.kernel.org>,
	"Romain Merland" <merlorom@yahoo.fr>,
	"Miguel Torroja" <miguel.torroja@gmail.com>,
	"Lars Schneider" <larsxschneider@gmail.com>,
	"George Vanburgh" <gvanburgh@bloomberg.net>
Subject: Re: [PATCH 1/1] git-p4: unshelve: use action==add instead of rev==none
Date: Wed, 23 May 2018 11:05:10 +0900	[thread overview]
Message-ID: <xmqqk1rvw2i1.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAE5ih79_Ai8F48zFpJ09e8saGrySoiyVdsgkk8ZpRrQAd15a4g@mail.gmail.com> (Luke Diamand's message of "Tue, 22 May 2018 14:02:31 +0100")

Luke Diamand <luke@diamand.org> writes:

>> However, instead of a separate patch, wouldn't it be better to squash
>> it into the previous one?  So 'make test' would succeed on every
>> commit even with a newer p4 version.
>
> Junio?
>
> I can squash together the original commit and the two fixes if that
> would be better?

Among the three hunks in this fix-up patch, the first two are
strictly fixing what you had in the previous patch, so it make sense
to fix them at the source by squashing.

The last one (i.e. "even if it is verbose, if fileSize is not
reported, do not write the verbose output") does not look like it is
limited to the unshelve feature, so it might, even though it is a
one-liner, deserve to be a separate preparatory patch if you want.
But I do not feel strongly about either way.

Thanks.

  reply	other threads:[~2018-05-23  2:05 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-22  8:41 [PATCH 0/1] git-p4: unshelving: fix problem with newer P4 Luke Diamand
2018-05-22  8:41 ` [PATCH 1/1] git-p4: unshelve: use action==add instead of rev==none Luke Diamand
2018-05-22 10:15   ` SZEDER Gábor
2018-05-22 13:02     ` Luke Diamand
2018-05-23  2:05       ` Junio C Hamano [this message]
2018-05-23  7:21         ` [PATCHv5 0/1] git-p4: unshelve: fix problem with newer p4d Luke Diamand
2018-05-23  7:21           ` [PATCHv5 1/1] git-p4: add unshelve command Luke Diamand
2018-05-23 16:41         ` [PATCH 1/1] git-p4: unshelve: use action==add instead of rev==none Mazo, Andrey
2018-05-23 19:12           ` Luke Diamand
2018-05-23 19:38             ` Mazo, Andrey

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=xmqqk1rvw2i1.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gvanburgh@bloomberg.net \
    --cc=larsxschneider@gmail.com \
    --cc=luke@diamand.org \
    --cc=merlorom@yahoo.fr \
    --cc=miguel.torroja@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. 
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).