From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: [PATCH] t7601: extend the 'merge picks up the best result' test Date: Tue, 22 Jul 2008 19:05:59 +0200 Message-ID: <1216746359-21170-1-git-send-email-vmiklos@frugalware.org> References: <7v7ibenx75.fsf@gitster.siamese.dyndns.org> Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Jul 22 19:07:18 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KLLJp-000085-LD for gcvg-git-2@gmane.org; Tue, 22 Jul 2008 19:06:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752412AbYGVRFe (ORCPT ); Tue, 22 Jul 2008 13:05:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752264AbYGVRFe (ORCPT ); Tue, 22 Jul 2008 13:05:34 -0400 Received: from yugo.dsd.sztaki.hu ([195.111.2.114]:40844 "EHLO yugo.frugalware.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752187AbYGVRFd (ORCPT ); Tue, 22 Jul 2008 13:05:33 -0400 Received: from vmobile.example.net (dsl5400FADC.pool.t-online.hu [84.0.250.220]) by yugo.frugalware.org (Postfix) with ESMTP id E44B11DDC5B; Tue, 22 Jul 2008 19:05:31 +0200 (CEST) Received: by vmobile.example.net (Postfix, from userid 1003) id 861431AA738; Tue, 22 Jul 2008 19:05:59 +0200 (CEST) X-Mailer: git-send-email 1.5.6.4.433.g09651.dirty In-Reply-To: <7v7ibenx75.fsf@gitster.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The test only checked if the best result picking code works if there are multiple strategies set in the config. Add a similar one that tests if the same true if the -s option of git merge was used multiple times. Signed-off-by: Miklos Vajna --- On Tue, Jul 22, 2008 at 01:24:14AM -0700, Junio C Hamano wrote: > Don't. pull.* has always been defined as "list of strategies", and -s > has > always been defined to take "a" strategy. OK. Here is a testcase for the later. As far as I see the behaviour of multiple -s was not checked till now. t/t7601-merge-pull-config.sh | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 6b9f638..55aa6b5 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -112,6 +112,21 @@ test_expect_success 'setup conflicted merge' ' # recusive is choosen. test_expect_success 'merge picks up the best result' ' + git config --unset-all pull.twohead && + git reset --hard c5 && + git merge -s resolve c6 + resolve_count=$(conflict_count) && + git reset --hard c5 && + git merge -s recursive c6 + recursive_count=$(conflict_count) && + git reset --hard c5 && + git merge -s recursive -s resolve c6 + auto_count=$(conflict_count) && + test $auto_count = $recursive_count && + test $auto_count != $resolve_count +' + +test_expect_success 'merge picks up the best result (from config)' ' git config pull.twohead "recursive resolve" && git reset --hard c5 && git merge -s resolve c6 -- 1.5.6.4.433.g09651.dirty