From 88c27934a1724ff5eda0c4c42b2b8fde9bf2e2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Thu, 28 Jan 2021 21:58:45 +0100 Subject: [PATCH] Update some stubs to be closer to how git behaves --- pkg/cmd/pr/checkout/checkout_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/pr/checkout/checkout_test.go b/pkg/cmd/pr/checkout/checkout_test.go index b9e7308de..ed1775f44 100644 --- a/pkg/cmd/pr/checkout/checkout_test.go +++ b/pkg/cmd/pr/checkout/checkout_test.go @@ -165,7 +165,7 @@ func TestPRCheckout_urlArg_differentBase(t *testing.T) { defer cmdTeardown(t) cs.Register(`git fetch https://github\.com/OTHER/POE\.git refs/pull/123/head:feature`, 0, "") - cs.Register(`git config branch\.feature\.merge`, 0, "") + cs.Register(`git config branch\.feature\.merge`, 1, "") cs.Register(`git checkout feature`, 0, "") cs.Register(`git config branch\.feature\.remote https://github\.com/OTHER/POE\.git`, 0, "") cs.Register(`git config branch\.feature\.merge refs/pull/123/head`, 0, "") @@ -210,7 +210,7 @@ func TestPRCheckout_branchArg(t *testing.T) { defer cmdTeardown(t) cs.Register(`git fetch origin refs/pull/123/head:feature`, 0, "") - cs.Register(`git config branch\.feature\.merge`, 0, "") + cs.Register(`git config branch\.feature\.merge`, 1, "") cs.Register(`git checkout feature`, 0, "") cs.Register(`git config branch\.feature\.remote origin`, 0, "") cs.Register(`git config branch\.feature\.merge refs/pull/123/head`, 0, "")