diff options
Diffstat (limited to 'third_party/git/t/t3506-cherry-pick-ff.sh')
| -rwxr-xr-x | third_party/git/t/t3506-cherry-pick-ff.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/third_party/git/t/t3506-cherry-pick-ff.sh b/third_party/git/t/t3506-cherry-pick-ff.sh index 9d5adbc130..127dd0082f 100755 --- a/third_party/git/t/t3506-cherry-pick-ff.sh +++ b/third_party/git/t/t3506-cherry-pick-ff.sh @@ -16,11 +16,7 @@ test_expect_success setup ' git add file1 && test_tick && git commit -m "second" && - git tag second && - test_oid_cache <<-EOF - cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1 - cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d - EOF + git tag second ' test_expect_success 'cherry-pick using --ff fast forwards' ' @@ -106,7 +102,7 @@ test_expect_success 'cherry pick a root commit with --ff' ' git add file2 && git commit --amend -m "file2" && git cherry-pick --ff first && - test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)" + test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1" ' test_expect_success 'cherry-pick --ff on unborn branch' ' |