From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacob Keller Subject: [PATCH v8 6/8] notes: add tests for --commit/--abort/--strategy exclusivity Date: Mon, 17 Aug 2015 01:46:29 -0700 Message-ID: <1439801191-3026-7-git-send-email-jacob.e.keller@intel.com> References: <1439801191-3026-1-git-send-email-jacob.e.keller@intel.com> Cc: Johan Herland , Eric Sunshine , Jacob Keller To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Aug 17 10:47:49 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZRG55-0002vM-9z for gcvg-git-2@plane.gmane.org; Mon, 17 Aug 2015 10:47:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754632AbbHQIrf (ORCPT ); Mon, 17 Aug 2015 04:47:35 -0400 Received: from mga14.intel.com ([192.55.52.115]:64623 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754628AbbHQIrR (ORCPT ); Mon, 17 Aug 2015 04:47:17 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 17 Aug 2015 01:47:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,693,1432623600"; d="scan'208";a="770177873" Received: from jekeller-desk.amr.corp.intel.com (HELO jekeller-desk.jekeller.internal) ([134.134.3.123]) by fmsmga001.fm.intel.com with ESMTP; 17 Aug 2015 01:47:15 -0700 X-Mailer: git-send-email 2.5.0.280.g4aaba03 In-Reply-To: <1439801191-3026-1-git-send-email-jacob.e.keller@intel.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Jacob Keller Add new tests to ensure that --commit, --abort, and --strategy are mutually exclusive. Signed-off-by: Jacob Keller --- t/t3310-notes-merge-manual-resolve.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index 195bb97f859d..d5572121da69 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -314,6 +314,18 @@ y and z notes on 1st commit EOF +test_expect_success 'do not allow mixing --commit and --abort' ' + test_must_fail git notes merge --commit --abort +' + +test_expect_success 'do not allow mixing --commit and --strategy' ' + test_must_fail git notes merge --commit --strategy theirs +' + +test_expect_success 'do not allow mixing --abort and --strategy' ' + test_must_fail git notes merge --abort --strategy theirs +' + test_expect_success 'finalize conflicting merge (z => m)' ' # Resolve conflicts and finalize merge cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <