git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Luke Diamand <luke@diamand.org>
Cc: Git List <git@vger.kernel.org>,
	"Liu Xuhui (Jackson)" <Xuhui.Liu@amd.com>
Subject: Re: [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve
Date: Sun, 20 Sep 2020 01:31:25 -0400	[thread overview]
Message-ID: <CAPig+cSx35oTR_Er-DyxqV0HZw+tDHPf1GdARfw=-2bhTz02gw@mail.gmail.com> (raw)
In-Reply-To: <20200919085441.7621-2-luke@diamand.org>

On Sat, Sep 19, 2020 at 4:54 AM Luke Diamand <luke@diamand.org> wrote:
> git-p4 unshelve: adding a commit breaks git-p4 unshelve
>
> git-p4 unshelve uses HEAD^$n to find the parent commit, which
> fails if there is an additional commit.

It was a bit difficult understanding the purpose of this patch based
upon the commit message alone. It might be clearer if written like
this:

    git-p4: demonstrate `unshelve` bug

    `git p4 unshelve` uses HEAD^$n to find the parent commit, which
    fails if there is an additional commit. Augment the tests to
    demonstrate this problem.

> Signed-off-by: Luke Diamand <luke@diamand.org>
> ---
> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
> @@ -29,8 +29,11 @@ test_expect_success 'init depot' '
> +# Create an initial clone, with a commit unrelated to the P4 change
> +# on HEAD
>  test_expect_success 'initial clone' '
> -       git p4 clone --dest="$git" //depot/@all
> +       git p4 clone --dest="$git" //depot/@all &&
> +    test_commit -C "$git" "unrelated"
>  '

Strange indentation of the new line. Use TAB rather than spaces.

      parent reply	other threads:[~2020-09-20  5:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-19  8:54 [PATCH 0/2] git-p4: unshelve uses HEAD^n, not HEAD~n Luke Diamand
2020-09-19  8:54 ` [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve Luke Diamand
2020-09-19  8:54   ` [PATCH 2/2] git-p4: use HEAD~$n to find parent commit for unshelve Luke Diamand
2020-09-20  5:34     ` Eric Sunshine
2020-09-20  5:31   ` Eric Sunshine [this message]

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='CAPig+cSx35oTR_Er-DyxqV0HZw+tDHPf1GdARfw=-2bhTz02gw@mail.gmail.com' \
    --to=sunshine@sunshineco.com \
    --cc=Xuhui.Liu@amd.com \
    --cc=git@vger.kernel.org \
    --cc=luke@diamand.org \
    --subject='Re: [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve' \
    /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

Code repositories for project(s) associated with this 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).