From 14617e59e924b38cd3eda40867981f3916eaff00 Mon Sep 17 00:00:00 2001 From: William Martin Date: Fri, 16 Feb 2024 16:30:00 +0100 Subject: [PATCH] Update test to run against trunk --- pkg/cmd/pr/create/create_test.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/cmd/pr/create/create_test.go b/pkg/cmd/pr/create/create_test.go index 72953705f..a8baa4883 100644 --- a/pkg/cmd/pr/create/create_test.go +++ b/pkg/cmd/pr/create/create_test.go @@ -1004,14 +1004,9 @@ func Test_createRun(t *testing.T) { }, cmdStubs: func(cs *run.CommandStubber) { cs.Register( - "git -c log.ShowSignature=false log --pretty=format:%H,%s --cherry origin/master...feature", + "git -c log.ShowSignature=false log --pretty=format:%H,%s,%b --cherry origin/master...feature", 0, - "343jdfe47c9e3a30093cd17e48934ce354148e80,first commit of pr\n\nfirst commit description\n", - ) - cs.Register( - "git -c log.ShowSignature=false show -s --pretty=format:%b 343jdfe47c9e3a30093cd17e48934ce354148e80", - 0, - "first commit description", + "3a9b48085046d156c5acce8f3b3a0532cd706a4a,first commit of pr,first commit description\n", ) cs.Register(`git rev-parse --show-toplevel`, 0, "") },