diff options
| author | Luke Diamand <luke@diamand.org> | 2020-09-19 11:54:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-19 23:44:55 +0300 |
| commit | 0acbf5997fa26747aec544d2ef6a27e4feb75e81 (patch) | |
| tree | bbaad706fe41e9d78a85b24fd42b87511f5ba0ad /t/t9832-unshelve.sh | |
| parent | 677fa8d1157c869974355e316d0e2349759d0325 (diff) | |
git-p4: use HEAD~$n to find parent commit for unshelve
Found-by: Liu Xuhui (Jackson) <Xuhui.Liu@amd.com>
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9832-unshelve.sh')
| -rwxr-xr-x | t/t9832-unshelve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh index feda4499dd..7194fb2855 100755 --- a/t/t9832-unshelve.sh +++ b/t/t9832-unshelve.sh @@ -80,7 +80,7 @@ EOF ) ' -test_expect_failure 'update shelved changelist and re-unshelve' ' +test_expect_success 'update shelved changelist and re-unshelve' ' test_when_finished cleanup_git && ( cd "$cli" && |