diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-25 22:25:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-25 22:25:40 (GMT) |
| commit | 9f4588d72b035714d4524342479e375742ac05b3 (patch) | |
| tree | 5dc6b95bf502b2b8d664567dbd2d006ef1acf765 /t | |
| parent | 6c430a647cb990fc856d328733fa59e1fafadb97 (diff) | |
| parent | 0acbf5997fa26747aec544d2ef6a27e4feb75e81 (diff) | |
| download | git-9f4588d72b035714d4524342479e375742ac05b3.zip git-9f4588d72b035714d4524342479e375742ac05b3.tar.gz git-9f4588d72b035714d4524342479e375742ac05b3.tar.bz2 | |
Merge branch 'ld/p4-unshelve-fix'
The "unshelve" subcommand of "git p4" used incorrectly used
commit^N where it meant to say commit~N to name the Nth generation
ancestor, which has been corrected.
* ld/p4-unshelve-fix:
git-p4: use HEAD~$n to find parent commit for unshelve
git-p4 unshelve: adding a commit breaks git-p4 unshelve
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9832-unshelve.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh index e9276c4..7194fb2 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' ' |