From patchwork Tue Feb 26 00:26:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 10829325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 07C191575 for ; Tue, 26 Feb 2019 00:26:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA4AA2B99B for ; Tue, 26 Feb 2019 00:26:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DEA532B9AE; Tue, 26 Feb 2019 00:26:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DEE12B99B for ; Tue, 26 Feb 2019 00:26:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729343AbfBZA0x (ORCPT ); Mon, 25 Feb 2019 19:26:53 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:53291 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729332AbfBZA0w (ORCPT ); Mon, 25 Feb 2019 19:26:52 -0500 Received: by mail-wm1-f68.google.com with SMTP id e74so682199wmg.3 for ; Mon, 25 Feb 2019 16:26:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9vzRKvwGNszBCWl0xynz6wQvHytSZbm5ybB6pgFv9Z4=; b=bhuw39JheYX292rc0d0SkqgBy2nioYhNQfP+aXe1621vti5BW/+6gxG/vsdF+j467y XseVP3NA3dnnvittgNVtGOAHkIlqOvVqJrnCgdEu9abD8t0G6hXm0ig5wDg6ZFJoMSE8 7UZVPnxEnT9WOF7+ilTiwrdyVF0tvHEYTo25kTn3QjkbD789fLWWVa7m7VMCnH9Wpd94 PFqZS4v3D3dSbZOmSjYsRLE/pz7EAh8XhQCbRf58DC7neZxnsWP/QPm+1y1qXclH1B2z q2NQ3AeWGLWpyjipFmLcj82UiZdoYPhesgzxihPrc6D6asNAK+W7Bdc7AokQ61PcuLE3 YbvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9vzRKvwGNszBCWl0xynz6wQvHytSZbm5ybB6pgFv9Z4=; b=HK4WGQLJgSMSW2RNy6jj46V8kUBSmsfJX2RE78pUlHUua0MxFhX5DWXliILGgym66X scbiFfFBcwhk2k2/hTUYI9l1Nbr13ek9I5xbf9RWdkycSLINnAnWB99TgIkrJy86H50i TsHtLTxuhaTNYzFj1t9IKG4BUneaA54Vbc+xBKyaxmx05pyBz9iKiQ4OzgrcfsRT52mq NW4OfVporzROgG5+L5u5+oHAtHctnkY/WTIt2DJW2UlkN9Q9fVG72iqj5T9xPhqFs4qp aJ2jFBWvaD37362MRpx/Vrs950kSuAqG7StfByR+U7FOJLRCZnFFEl/E4O/9/cTDEWle uwzA== X-Gm-Message-State: AHQUAuYHezohdmbMNtwsyYxuYsaBk8dh/yQuf00b7x1IFDhMXfNzzU+n OSnS8uJGPQckotlGaYVH8j0DHFybIV0= X-Google-Smtp-Source: AHgI3IbsSeR3AQOGubWF2yDRt2YjQe7mlUmho0vkm1BR+gnhyRrlA+KMZYV2CF+iN0AqiZmbl2l/UQ== X-Received: by 2002:a1c:80c4:: with SMTP id b187mr730886wmd.23.1551140810514; Mon, 25 Feb 2019 16:26:50 -0800 (PST) Received: from vm.nix.is ([2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id e6sm11745708wrt.14.2019.02.25.16.26.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 25 Feb 2019 16:26:49 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= , Matheus Tavares , Thomas Gummerer , Christian Couder , =?utf-8?b?w4Z2YXIgQXJuZmo=?= =?utf-8?b?w7Zyw7AgQmphcm1hc29u?= Subject: [WIP RFC PATCH 4/7] clone: test for our behavior on odd objects/* content Date: Tue, 26 Feb 2019 01:26:22 +0100 Message-Id: <20190226002625.13022-5-avarab@gmail.com> X-Mailer: git-send-email 2.21.0.rc2.261.ga7da99ff1b In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We've implicitly supported .git/objects/* content of symlinks since approximately forever, and when we do a copy of the repo we transfer those over, but aren't very consistent about other random stuff we find depending on if it's a "hidden" file or not. Let's add a test for that, which shouldn't read as an endorsement of what we're doing now, just asserts current behavior. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t5604-clone-reference.sh | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh index 4320082b1b..6f9c77049e 100755 --- a/t/t5604-clone-reference.sh +++ b/t/t5604-clone-reference.sh @@ -221,4 +221,64 @@ test_expect_success 'clone, dissociate from alternates' ' ( cd C && git fsck ) ' +test_expect_success SHA1,SYMLINKS 'setup repo with manually symlinked objects/*' ' + git init S && + ( + cd S && + test_commit A && + git gc && + test_commit B && + ( + cd .git/objects && + mv 22/3b7836fb19fdf64ba2d3cd6173c6a283141f78 . && + ln -s ../3b7836fb19fdf64ba2d3cd6173c6a283141f78 22/ && + mv 40 forty && + ln -s forty 40 && + mv pack packs && + ln -s packs pack && + >.some-hidden-file && + >some-file && + mkdir .some-hidden-dir && + >.some-hidden-dir/some-file && + >.some-hidden-dir/.some-dot-file && + mkdir some-dir && + >some-dir/some-file && + >some-dir/.some-dot-file + ) + ) +' + +test_expect_success SHA1,SYMLINKS 'clone repo with manually symlinked objects/*' ' + for option in --local --no-hardlinks --shared --dissociate + do + git clone $option S S$option || return 1 && + git -C S$option fsck || return 1 + done && + find S-* -type l | sort >actual && + cat >expected <<-EOF && + S--dissociate/.git/objects/22/3b7836fb19fdf64ba2d3cd6173c6a283141f78 + S--local/.git/objects/22/3b7836fb19fdf64ba2d3cd6173c6a283141f78 + EOF + test_cmp expected actual && + find S-* -name "*some*" | sort >actual && + cat >expected <<-EOF && + S--dissociate/.git/objects/.some-hidden-file + S--dissociate/.git/objects/some-dir + S--dissociate/.git/objects/some-dir/.some-dot-file + S--dissociate/.git/objects/some-dir/some-file + S--dissociate/.git/objects/some-file + S--local/.git/objects/.some-hidden-file + S--local/.git/objects/some-dir + S--local/.git/objects/some-dir/.some-dot-file + S--local/.git/objects/some-dir/some-file + S--local/.git/objects/some-file + S--no-hardlinks/.git/objects/.some-hidden-file + S--no-hardlinks/.git/objects/some-dir + S--no-hardlinks/.git/objects/some-dir/.some-dot-file + S--no-hardlinks/.git/objects/some-dir/some-file + S--no-hardlinks/.git/objects/some-file + EOF + test_cmp expected actual +' + test_done