From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Greene Subject: [PATCH 4/7] contrib/subtree: Add merge tests Date: Thu, 5 Nov 2015 21:35:00 -0600 Message-ID: <1446780903-22156-5-git-send-email-greened@obbligato.org> References: <1446780903-22156-1-git-send-email-greened@obbligato.org> Cc: techlivezheng@gmail.com, alex.crezoff@gmail.com, davvid@gmail.com, cbailey32@bloomberg.net, danny0838@gmail.com, prohaska@zib.de, th.acker@arcor.de, sschuberth@gmail.com, peff@peff.net, gitter.spiros@gmail.com, nod.helm@gmail.com, "David A . Greene" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Nov 06 05:20:54 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 1ZuYWD-0007Cp-5f for gcvg-git-2@plane.gmane.org; Fri, 06 Nov 2015 05:20:53 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031426AbbKFEUs (ORCPT ); Thu, 5 Nov 2015 23:20:48 -0500 Received: from li209-253.members.linode.com ([173.255.199.253]:48863 "EHLO johnson.obbligato.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1030793AbbKFEUr (ORCPT ); Thu, 5 Nov 2015 23:20:47 -0500 Received: from chippewa-nat.cray.com ([136.162.34.1] helo=waller.us.cray.com) by johnson.obbligato.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.85) (envelope-from ) id 1ZuXpE-0005Zp-8E; Thu, 05 Nov 2015 21:36:28 -0600 X-Mailer: git-send-email 2.6.1 In-Reply-To: <1446780903-22156-1-git-send-email-greened@obbligato.org> X-Filter-Spam-Score: () X-Filter-Spam-Report: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Techlive Zheng Add some tests for various merge operations. Test combinations of merge with --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 1fa5991..7d59a1a 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -210,11 +210,22 @@ test_expect_success 'check if --message for merge works with squash too' ' test_expect_success 'merge new subproj history into subdir' ' git subtree merge --prefix="sub dir" FETCH_HEAD && - git branch pre-split && check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" && undo ' +test_expect_success 'merge new subproj history into subdir/ with --prefix and --message' ' + git subtree merge --prefix="sub dir" --message="Merged changes from subproject" FETCH_HEAD && + check_equal "$(last_commit_message)" "Merged changes from subproject" && + undo +' + +test_expect_success 'merge new subproj history into subdir/ with --squash and --prefix and --message' ' + git subtree merge --prefix="sub dir" --message="Merged changes from subproject using squash" --squash FETCH_HEAD && + check_equal "$(last_commit_message)" "Merged changes from subproject using squash" && + undo +' + test_expect_success 'split requires option --prefix' ' echo "You must provide the --prefix option." > expected && test_must_fail git subtree split > actual 2>&1 && -- 2.6.1