From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacob Keller Subject: [PATCH v4 2/4] notes: add tests for --commit/--abort/--strategy exclusivity Date: Tue, 11 Aug 2015 13:57:19 -0700 Message-ID: <1439326641-9447-3-git-send-email-jacob.e.keller@intel.com> References: <1439326641-9447-1-git-send-email-jacob.e.keller@intel.com> Cc: Johan Herland , Michael Haggerty , Eric Sunshine , Junio C Hamano , Jacob Keller To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 11 22:57:37 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 1ZPGc2-0003pT-9w for gcvg-git-2@plane.gmane.org; Tue, 11 Aug 2015 22:57:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602AbbHKU5b (ORCPT ); Tue, 11 Aug 2015 16:57:31 -0400 Received: from mga01.intel.com ([192.55.52.88]:9837 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753535AbbHKU5a (ORCPT ); Tue, 11 Aug 2015 16:57:30 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 11 Aug 2015 13:57:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,655,1432623600"; d="scan'208";a="782214964" Received: from jekeller-desk.amr.corp.intel.com ([134.134.3.85]) by orsmga002.jf.intel.com with ESMTP; 11 Aug 2015 13:57:30 -0700 X-Mailer: git-send-email 2.5.0.482.gfcd5645 In-Reply-To: <1439326641-9447-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 <