From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Greene Subject: [PATCH] Add a test for subtree rebase that loses commits Date: Mon, 4 Jan 2016 22:40:05 -0600 Message-ID: <1451968805-6948-2-git-send-email-greened@obbligato.org> References: <1451968805-6948-1-git-send-email-greened@obbligato.org> Cc: gitster@pobox.com, john@keeping.me.uk, sandals@crustytoothpaste.net, peff@peff.net, "David A. Greene" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jan 05 05:41:04 2016 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 1aGJQb-00013w-GM for gcvg-git-2@plane.gmane.org; Tue, 05 Jan 2016 05:41:01 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754023AbcAEEkW (ORCPT ); Mon, 4 Jan 2016 23:40:22 -0500 Received: from li209-253.members.linode.com ([173.255.199.253]:45839 "EHLO johnson.obbligato.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753884AbcAEEkV (ORCPT ); Mon, 4 Jan 2016 23:40:21 -0500 Received: from 206-55-177-216.fttp.usinternet.com ([206.55.177.216] helo=waller.obbligato.org) by johnson.obbligato.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.85) (envelope-from ) id 1aGJQn-0000AE-B4; Mon, 04 Jan 2016 22:41:13 -0600 X-Mailer: git-send-email 2.6.1 In-Reply-To: <1451968805-6948-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: "David A. Greene" This test merges an external tree in as a subtree, makes some commits on top of it and splits it back out. In the process the added commits are lost. This is marked to expect failure so that we don't forget to fix it. Signed-off-by: David A. Greene --- t/t3427-rebase-subtree.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100755 t/t3427-rebase-subtree.sh diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh new file mode 100755 index 0000000..7eb28ab --- /dev/null +++ b/t/t3427-rebase-subtree.sh @@ -0,0 +1,68 @@ +#!/bin/sh + +test_description='git rebase tests for -Xsubtree + +This test runs git rebase and tests the subtree strategy. +' +. ./test-lib.sh + +addfile() { + name=$1 + echo $(basename ${name}) > ${name} + ${git} add ${name} + ${git} commit -m "Add $(basename ${name})" +} + +check_equal() +{ + test_debug 'echo' + test_debug "echo \"check a:\" \"{$1}\"" + test_debug "echo \" b:\" \"{$2}\"" + if [ "$1" = "$2" ]; then + return 0 + else + return 1 + fi +} + +last_commit_message() +{ + git log --pretty=format:%s -1 +} + +test_expect_success 'setup' ' + test_commit README && + mkdir files && + cd files && + git init && + test_commit master1 && + test_commit master2 && + test_commit master3 && + cd .. && + test_debug "echo Add project master to master" && + git fetch files master && + git branch files-master FETCH_HEAD && + test_debug "echo Add subtree master to master via subtree" && + git read-tree --prefix=files_subtree files-master && + git checkout -- files_subtree && + tree=$(git write-tree) && + head=$(git rev-parse HEAD) && + rev=$(git rev-parse --verify files-master^0) && + commit=$(git commit-tree -p ${head} -p ${rev} -m "Add subproject master" ${tree}) && + git reset ${commit} && + cd files_subtree && + test_commit master4 && + cd .. && + test_commit files_subtree/master5 +' + +# Does not preserve master4 and master5. +test_expect_failure 'Rebase default' ' + git checkout -b rebase-default master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && + git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master && + check_equal "$(last_commit_message)" "files_subtree/master5" +' + +test_done -- 2.6.1