From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gummerer Subject: [PATCH/RFC v4 03/13] t2104: Don't fail for index versions other than [23] Date: Thu, 16 Aug 2012 11:58:39 +0200 Message-ID: <1345111129-6925-4-git-send-email-t.gummerer@gmail.com> References: <1345111129-6925-1-git-send-email-t.gummerer@gmail.com> Cc: trast@student.ethz.ch, pclouds@gmail.com, mhagger@alum.mit.edu, gitster@pobox.com, robin.rosenberg@dewire.com, t.gummerer@gmail.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Aug 16 11:59:22 2012 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 1T1wrJ-0007z6-9c for gcvg-git-2@plane.gmane.org; Thu, 16 Aug 2012 11:59:21 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756323Ab2HPJ7P (ORCPT ); Thu, 16 Aug 2012 05:59:15 -0400 Received: from li348-43.members.linode.com ([178.79.179.43]:48152 "EHLO tgummerer.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756138Ab2HPJ7M (ORCPT ); Thu, 16 Aug 2012 05:59:12 -0400 Received: by tgummerer.com (Postfix, from userid 1001) id E0A3B4EF6D; Thu, 16 Aug 2012 11:59:08 +0200 (CEST) X-Mailer: git-send-email 1.7.10.GIT In-Reply-To: <1345111129-6925-1-git-send-email-t.gummerer@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org t2104 currently checks for the exact index version 2 or 3, depending if there is a skip-worktree flag or not. Other index versions do not use extended flags and thus cannot be tested for version changes. Make this test update the index to version 2 at the beginning of the test. Testing the skip-worktree flags for the default index format is still covered by t7011 and t7012. Signed-off-by: Thomas Gummerer --- t/t2104-update-index-skip-worktree.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh index 1d0879b..bd9644f 100755 --- a/t/t2104-update-index-skip-worktree.sh +++ b/t/t2104-update-index-skip-worktree.sh @@ -22,6 +22,7 @@ H sub/2 EOF test_expect_success 'setup' ' + git update-index --index-version=2 && mkdir sub && touch ./1 ./2 sub/1 sub/2 && git add 1 2 sub/1 sub/2 && -- 1.7.11.2