| Message ID | 20200919085441.7621-2-luke@diamand.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | git-p4: unshelve uses HEAD^n, not HEAD~n | expand |
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.
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh index e9276c48f4..feda4499dd 100755 --- 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" ' test_expect_success 'create shelved changelist' ' @@ -77,7 +80,7 @@ EOF ) ' -test_expect_success 'update shelved changelist and re-unshelve' ' +test_expect_failure 'update shelved changelist and re-unshelve' ' test_when_finished cleanup_git && ( cd "$cli" &&
git-p4 unshelve uses HEAD^$n to find the parent commit, which fails if there is an additional commit. Signed-off-by: Luke Diamand <luke@diamand.org> --- t/t9832-unshelve.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)