From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pete Wyckoff Subject: [PATCHv2 1/2] fast-import: test behavior of garbage after mark references Date: Mon, 2 Apr 2012 21:51:49 -0400 Message-ID: <1333417910-17955-2-git-send-email-pw@padd.com> References: <20120401225407.GA12127@padd.com> <1333417910-17955-1-git-send-email-pw@padd.com> Cc: Jonathan Nieder , Dmitry Ivankov , David Barr , Sverre Rabbelier , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Apr 03 03:52:19 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 1SEsuw-0001BF-P7 for gcvg-git-2@plane.gmane.org; Tue, 03 Apr 2012 03:52:19 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752428Ab2DCBwO (ORCPT ); Mon, 2 Apr 2012 21:52:14 -0400 Received: from honk.padd.com ([74.3.171.149]:47811 "EHLO honk.padd.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276Ab2DCBwO (ORCPT ); Mon, 2 Apr 2012 21:52:14 -0400 Received: from arf.padd.com (unknown [50.55.145.32]) by honk.padd.com (Postfix) with ESMTPSA id 4C31820CE; Mon, 2 Apr 2012 18:52:13 -0700 (PDT) Received: by arf.padd.com (Postfix, from userid 7770) id 012E9313CD; Mon, 2 Apr 2012 21:52:10 -0400 (EDT) X-Mailer: git-send-email 1.7.10.rc2.57.gb1c2d In-Reply-To: <1333417910-17955-1-git-send-email-pw@padd.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add 15 tests to see what happens when extra characters appear after a mark reference, in all places that take marks. Ten of these fail. Signed-off-by: Pete Wyckoff --- t/t9300-fast-import.sh | 267 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 0f5b5e5..621f02a 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2635,4 +2635,271 @@ test_expect_success \ 'n=$(grep $a verify | wc -l) && test 1 = $n' +### +### series S +### +# +# Set up is roughly this. Commits marked 1,2,3,4. Blobs +# marked 100 + commit. Notes 200 +. Make sure missing spaces +# and EOLs after mark references cause errors. +# +# 1--2--4 +# \ / +# -3- +# +test_tick + +cat >input < $GIT_COMMITTER_DATE +data < $GIT_COMMITTER_DATE +data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/Snotes + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err + commit refs/heads/S2 + mark :3 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + mark :4 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + tag refs/tags/Stag + from :2x + tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + cat-blob :2x + EOF + cat err && + grep -q "Garbage after mark" err +' + +# +# ls markref +# +test_expect_failure 'S: ls markref space' ' + test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && + ls :2x hello.c + EOF + cat err && + grep -q "Missing space after mark" err +' + +test_expect_failure 'S: ls sha1 space' ' + sha1=$(grep -w :2 marks | cut -d\ -f2) && + test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && + ls ${sha1}x hello.c + EOF + cat err && + grep -q "Missing space after SHA1" err +' + test_done -- 1.7.10.rc2.2.g38670