On Sat, Sep 19, 2020 at 4:54 AM Luke Diamand <luke@xxxxxxxxxxx> 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@xxxxxxxxxxx>
> ---
> 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.
