From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Rast Subject: [PATCH] t6019: avoid refname collision on case-insensitive systems Date: Thu, 15 Sep 2011 10:34:31 +0200 Message-ID: <02451a2849fc8f1cab7983b6c8c629ebb6a1aaa9.1316075573.git.trast@student.ethz.ch> Mime-Version: 1.0 Content-Type: text/plain Cc: Brad King , To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Sep 15 10:34:39 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 1R47P5-0001d3-Bm for gcvg-git-2@lo.gmane.org; Thu, 15 Sep 2011 10:34:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753352Ab1IOIee (ORCPT ); Thu, 15 Sep 2011 04:34:34 -0400 Received: from edge20.ethz.ch ([82.130.99.26]:24302 "EHLO edge20.ethz.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752076Ab1IOIee (ORCPT ); Thu, 15 Sep 2011 04:34:34 -0400 Received: from CAS10.d.ethz.ch (172.31.38.210) by edge20.ethz.ch (82.130.99.26) with Microsoft SMTP Server (TLS) id 14.1.339.1; Thu, 15 Sep 2011 10:34:31 +0200 Received: from localhost.localdomain (129.132.153.233) by cas10.d.ethz.ch (172.31.38.210) with Microsoft SMTP Server (TLS) id 14.1.339.1; Thu, 15 Sep 2011 10:34:32 +0200 X-Mailer: git-send-email 1.7.7.rc1.366.ge210a6 X-Originating-IP: [129.132.153.233] Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The criss-cross tests kept failing for me because of collisions of 'a' with 'A' etc. Prefix the lowercase refnames with an extra letter to disambiguate. Signed-off-by: Thomas Rast --- This fixes the tests on OS X. Together with Peff's fix to the poll issue, it now tests clean again. t/t6019-rev-list-ancestry-path.sh | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh index 738af73..39b4cb0 100755 --- a/t/t6019-rev-list-ancestry-path.sh +++ b/t/t6019-rev-list-ancestry-path.sh @@ -75,33 +75,36 @@ test_expect_success 'rev-list --ancestry-patch D..M -- M.t' ' # a X # \ / \ # c---cb +# +# All refnames prefixed with 'x' to avoid confusion with the tags +# generated by test_commit on case-insensitive systems. test_expect_success 'setup criss-cross' ' mkdir criss-cross && (cd criss-cross && git init && test_commit A && - git checkout -b b master && + git checkout -b xb master && test_commit B && - git checkout -b c master && + git checkout -b xc master && test_commit C && - git checkout -b bc b -- && - git merge c && - git checkout -b cb c -- && - git merge b && + git checkout -b xbc xb -- && + git merge xc && + git checkout -b xcb xc -- && + git merge xb && git checkout master) ' # no commits in bc descend from cb test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' ' (cd criss-cross && - git rev-list --ancestry-path cb..bc > actual && + git rev-list --ancestry-path xcb..xbc > actual && test -z "$(cat actual)") ' # no commits in repository descend from cb test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' ' (cd criss-cross && - git rev-list --ancestry-path --all ^cb > actual && + git rev-list --ancestry-path --all ^xcb > actual && test -z "$(cat actual)") ' -- 1.7.7.rc1.366.ge210a6