git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: "Luke Diamand" <luke@diamand.org>,
	"Git List" <git@vger.kernel.org>,
	"vin ku" <viniciusalexandre@gmail.com>,
	"Romain Merland" <merlorom@yahoo.fr>,
	"SZEDER Gábor" <szeder.dev@gmail.com>,
	"Vitor Antunes" <vitor.hda@gmail.com>,
	amazo@checkvideo.com, aoakley@roku.com
Subject: Re: [PATCH 1/2] git-p4: add failing test for shelved CL update involving move
Date: Mon, 14 Jan 2019 11:03:09 -0800	[thread overview]
Message-ID: <xmqqr2dfuknm.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAPig+cSPL4vcfWR7Pos91N_SO-qCSBMYFY8vbyHX-POKyyRJpg@mail.gmail.com> (Eric Sunshine's message of "Sun, 13 Jan 2019 16:57:42 -0500")

Eric Sunshine <sunshine@sunshineco.com> writes:

> On Sun, Jan 13, 2019 at 8:58 AM Luke Diamand <luke@diamand.org> wrote:
>> Updating a shelved P4 changelist where one or more of the files have
>> been moved does not work. Add a test for this.
>
> Perhaps this message could give more detail about the actual problem
> than the generic "does not work" which provides no useful information.
>
>> Signed-off-by: Luke Diamand <luke@diamand.org>
>> ---
>> diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
>> @@ -500,6 +500,12 @@ test_expect_success 'submit --shelve' '
>> +last_shelve() {
>> +       change=$(p4 -G changes -s shelved -m 1 //depot/... | \
>> +               marshal_dump change)
>> +       echo $change
>> +}
>
> A simpler definition for this function would be:
>
> last_shelve () {
>     p4 -G changes -s shelved -m 1 //depot/... | marshal_dump change
> }

Indeed, and it will work better even when the output from marshal_dump
has $IFS and other traits that do not survive "echo $change" intact.


  reply	other threads:[~2019-01-14 19:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-13 13:58 [PATCH 0/2] git-p4: handle moved files when updating a P4 shelve Luke Diamand
2019-01-13 13:58 ` [PATCH 1/2] git-p4: add failing test for shelved CL update involving move Luke Diamand
2019-01-13 13:58   ` [PATCH 2/2] git-p4: handle update of moved files when updating a shelve Luke Diamand
2019-01-13 21:57   ` [PATCH 1/2] git-p4: add failing test for shelved CL update involving move Eric Sunshine
2019-01-14 19:03     ` Junio C Hamano [this message]
2019-01-14 18:56 ` [PATCH 0/2] git-p4: handle moved files when updating a P4 shelve Junio C Hamano

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=xmqqr2dfuknm.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=amazo@checkvideo.com \
    --cc=aoakley@roku.com \
    --cc=git@vger.kernel.org \
    --cc=luke@diamand.org \
    --cc=merlorom@yahoo.fr \
    --cc=sunshine@sunshineco.com \
    --cc=szeder.dev@gmail.com \
    --cc=viniciusalexandre@gmail.com \
    --cc=vitor.hda@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).