From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Seymour Subject: [PATCH v8 2/7] bisect: add tests to document expected behaviour in presence of broken trees. Date: Sun, 31 Jul 2011 21:55:16 +1000 Message-ID: <1312113321-28760-3-git-send-email-jon.seymour@gmail.com> References: <1312113321-28760-1-git-send-email-jon.seymour@gmail.com> Cc: chriscool@tuxfamily.org, gitster@pobox.com, j6t@kdbg.org, jnareb@gmail.com, Jon Seymour To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jul 31 13:56:34 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QnUdA-0002eN-Qg for gcvg-git-2@lo.gmane.org; Sun, 31 Jul 2011 13:56:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753325Ab1GaL4T (ORCPT ); Sun, 31 Jul 2011 07:56:19 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:33709 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753243Ab1GaL4S (ORCPT ); Sun, 31 Jul 2011 07:56:18 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so9556049pzk.1 for ; Sun, 31 Jul 2011 04:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=2L2btLYybXvW+bN5Rg3oiBRGoqNd2lnvSNPlvHaf3yY=; b=Z27OpCJs2d1i1Lgf+Krx1BpLeBvUH5om15zoachBAKmGFaHJ//JA5bqJrAUVpj9mTd NlsjZB2qtMd9aeYDJmoqc19WmYkq9u6RlrL3vOnFDU0bReqdUOG+05iYDi8zKJwIh8mf PRnt3NF7EqRvp5OYSS8M0FozOKoxIVwlS7A8k= Received: by 10.68.39.40 with SMTP id m8mr6010412pbk.156.1312113377750; Sun, 31 Jul 2011 04:56:17 -0700 (PDT) Received: from localhost.localdomain ([120.16.239.154]) by mx.google.com with ESMTPS id g4sm4306620pbj.41.2011.07.31.04.56.09 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 31 Jul 2011 04:56:16 -0700 (PDT) X-Mailer: git-send-email 1.7.6.352.g62761 In-Reply-To: <1312113321-28760-1-git-send-email-jon.seymour@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: If the repo is broken, we expect bisect to fail. Signed-off-by: Jon Seymour --- t/t6030-bisect-porcelain.sh | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index b3d1b14..9ae2de8 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -581,5 +581,53 @@ test_expect_success 'erroring out when using bad path parameters' ' ' # +# This creates a broken branch which cannot be checked out because +# the tree created has been deleted. # +# H1-H2-H3-H4-H5-H6-H7 <--other +# \ +# S5-S6'-S7'-S8'-S9 <--broken +# +# Commits marked with ' have a missing tree. +# +test_expect_success 'broken branch creation' ' + git bisect reset && + git checkout -b broken $HASH4 && + git tag BROKEN_HASH4 $HASH4 && + add_line_into_file "5(broken): first line on a broken branch" hello2 && + git tag BROKEN_HASH5 && + mkdir missing && + :> missing/MISSING && + git add missing/MISSING && + git commit -m "6(broken): Added file that will be deleted" + git tag BROKEN_HASH6 && + add_line_into_file "7(broken): second line on a broken branch" hello2 && + git tag BROKEN_HASH7 && + add_line_into_file "8(broken): third line on a broken branch" hello2 && + git tag BROKEN_HASH8 && + git rm missing/MISSING && + git commit -m "9(broken): Remove missing file" + git tag BROKEN_HASH9 && + rm .git/objects/39/f7e61a724187ab767d2e08442d9b6b9dab587d +' + +echo "" > expected.ok +cat > expected.missing-tree.default <error.txt && + test_cmp expected.missing-tree.default error.txt +' + +test_expect_success 'bisect fails if tree is broken on trial commit' ' + git bisect reset && + test_must_fail git bisect start BROKEN_HASH9 BROKEN_HASH4 2>error.txt && + git reset --hard broken && + git checkout broken && + test_cmp expected.missing-tree.default error.txt +' + test_done -- 1.7.6.391.g168d0.dirty