[v3,14/16] test: merge-pull-config: trivial cleanup

Message ID	20201205195313.1557473-15-felipe.contreras@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> From: Felipe Contreras <felipe.contreras@gmail.com> To: git@vger.kernel.org Cc: Elijah Newren <newren@gmail.com>, Alex Henrie <alexhenrie24@gmail.com>, Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>, Philip Oakley <philipoakley@iee.email>, Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH v3 14/16] test: merge-pull-config: trivial cleanup Date: Sat, 5 Dec 2020 13:53:11 -0600 Message-Id: <20201205195313.1557473-15-felipe.contreras@gmail.com> In-Reply-To: <20201205195313.1557473-1-felipe.contreras@gmail.com> References: <20201205195313.1557473-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[v3,01/16] doc: pull: explain what is a fast-forward \| expand [v3,01/16] doc: pull: explain what is a fast-forward [v3,02/16] pull: improve default warning [v3,03/16] pull: refactor fast-forward check [v3,04/16] pull: cleanup autostash check [v3,05/16] pull: trivial cleanup [v3,06/16] pull: move default warning [v3,07/16] pull: display default warning only when non-ff [v3,08/16] pull: trivial whitespace style fix [v3,09/16] pull: introduce --merge option [v3,10/16] pull: show warning with --ff [v3,11/16] rebase: add REBASE_DEFAULT [v3,12/16] pull: move configurations fetches [v3,13/16] pull: add proper error with --ff-only [v3,14/16] test: merge-pull-config: trivial cleanup [v3,15/16] test: pull-options: revert unnecessary changes [v3,16/16] pull: trivial memory fix

Message ID

20201205195313.1557473-15-felipe.contreras@gmail.com (mailing list archive)

State

Superseded

Headers

From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
        Alex Henrie <alexhenrie24@gmail.com>,
        Junio C Hamano <gitster@pobox.com>,
        Jeff King <peff@peff.net>,
        Philip Oakley <philipoakley@iee.email>,
        Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v3 14/16] test: merge-pull-config: trivial cleanup
Date: Sat,  5 Dec 2020 13:53:11 -0600
Message-Id: <20201205195313.1557473-15-felipe.contreras@gmail.com>
In-Reply-To: <20201205195313.1557473-1-felipe.contreras@gmail.com>
References: <20201205195313.1557473-1-felipe.contreras@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[v3,01/16] doc: pull: explain what is a fast-forward | expand

Commit Message

Felipe Contreras Dec. 5, 2020, 7:53 p.m. UTC

Commit e01ae2a4a7 introduced an extra space.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 t/t7601-merge-pull-config.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index d709799f8b..8a6aae564a 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -33,7 +33,6 @@  test_expect_success 'pull.rebase not set' '
 	test_decode_color <err >decoded &&
 	test_i18ngrep "<YELLOW>hint: " decoded &&
 	test_i18ngrep "Pulling without specifying how to reconcile" decoded
-
 '
 
 test_expect_success 'pull.rebase not set (fast-forward)' '

[v3,14/16] test: merge-pull-config: trivial cleanup

Commit Message

Patch