From patchwork Thu Mar 14 15:02:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 10853061 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 2C56917EF for ; Thu, 14 Mar 2019 15:09:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1801E292FA for ; Thu, 14 Mar 2019 15:09:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BCA52A0BD; Thu, 14 Mar 2019 15:09:44 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 9A963292FA for ; Thu, 14 Mar 2019 15:09:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726814AbfCNPJl (ORCPT ); Thu, 14 Mar 2019 11:09:41 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:57745 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726661AbfCNPJk (ORCPT ); Thu, 14 Mar 2019 11:09:40 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 5FDA55C59A; Thu, 14 Mar 2019 11:03:02 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=KnH3h7wvobi3CqxWda19vp9Wd E0=; b=lCGZb/mMgKI7V5uBCfMJtPvombpm6bo81I6KDLqEbdNfVEWQ831fqdUXM x9tHv+1bVJUqMEzyJL7qc51Nt5Ws9krzCWyoCRFxFbqc2EPvR0UU2Ms9eUcpIPzW 8Rm7bxbGRl7vzeFUeST7FpYZ0YI3GW9QS5EQ2iagSqCgwxNJV8= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 587885C599; Thu, 14 Mar 2019 11:03:02 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=mesmtp; bh=b3kXPWg5Ygvb2YKPa6xzcdbn3GvwteMOXHo+hgsrac0=; b=LIirAG6jw07L/1fmtexztv1Wrcgb3RNH6pYX3aURVb7zMMaHyBqJfzSJFfps/OpCBuk0FaXY0MwS4kdv3RKBtZDrS+G7Gjsr6e9UfUxp5PCGfpm7wPPsFqjZz/rEb18o8PDgSbSh03PRUgqOUrQmjCHq4AL3l09uzCnmQ12TYYk= Received: from hylob.dartmouth.edu (unknown [129.170.31.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 1FB9E5C591; Thu, 14 Mar 2019 11:02:58 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer To: git@vger.kernel.org Cc: debian@onerussian.com, Kyle Meyer Subject: [PATCH 1/4] submodule: refuse to add repository with no commits Date: Thu, 14 Mar 2019 11:02:16 -0400 Message-Id: <20190314150219.2040-2-kyle@kyleam.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314150219.2040-1-kyle@kyleam.com> References: <20190314150219.2040-1-kyle@kyleam.com> MIME-Version: 1.0 X-Pobox-Relay-ID: 41A8697A-466A-11E9-994F-D01F9763A999-24757444!pb-smtp20.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When the path given to 'git submodule add' is an existing repository that is not in the index, the repository is passed to 'git add'. If this repository doesn't have any commits, we don't get a useful result: there is no subproject OID to track, and any untracked files in the sub-repository are added to the current repository. Detect if the path is a repository with no commits and abort to avoid getting into this state unless --force is used. Reacting to --force isn't very useful, especially because an upcoming commit will make 'git add' fail in this situation, but it allows us to use the same 'git add --dry-run' condition as the ignored path case. Signed-off-by: Kyle Meyer --- git-submodule.sh | 12 ++++++++++-- t/t7400-submodule-basic.sh | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 514ede2596..6c74656027 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -234,10 +234,18 @@ cmd_add() if test -z "$force" && ! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1 then - eval_gettextln "The following path is ignored by one of your .gitignore files: + if test -d "$sm_path" && + test -z $(git -C "$sm_path" rev-parse --show-cdup 2>/dev/null) && + ! git -C "$sm_path" rev-parse --verify -q HEAD >/dev/null + then + die "$(eval_gettext "'\$sm_path' does not have any commits")" + else + eval_gettextln "\ +The following path is ignored by one of your .gitignore files: \$sm_path Use -f if you really want to add it." >&2 - exit 1 + exit 1 + fi fi if test -n "$custom_name" diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index aba2d4d6ee..6adf640143 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -46,6 +46,15 @@ test_expect_success 'submodule update aborts on missing gitmodules url' ' test_must_fail git submodule init ' +test_expect_success 'add aborts on repository with no commits' ' + cat >expected <<-\EOF && + '"'repo-no-commits'"' does not have any commits + EOF + git init repo-no-commits && + test_must_fail git submodule add ../a ./repo-no-commits 2>actual && + test_i18ncmp expected actual +' + test_expect_success 'setup - repository in init subdirectory' ' mkdir init && ( @@ -809,7 +818,7 @@ test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.gi cp pristine-.git-config .git/config && cp pristine-.gitmodules .gitmodules && mkdir -p a/b/c && - (cd a/b/c && git init) && + (cd a/b/c && git init && test_commit msg) && git config remote.origin.url ../foo/bar.git && git submodule add ../bar/a/b/c ./a/b/c && git submodule init && From patchwork Thu Mar 14 15:02:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 10853057 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 0FF4217EF for ; Thu, 14 Mar 2019 15:09:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F05BF2A0A7 for ; Thu, 14 Mar 2019 15:09:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E48EA2A117; Thu, 14 Mar 2019 15:09:40 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 523D22A0A7 for ; Thu, 14 Mar 2019 15:09:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726695AbfCNPJh (ORCPT ); Thu, 14 Mar 2019 11:09:37 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:55492 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726337AbfCNPJh (ORCPT ); Thu, 14 Mar 2019 11:09:37 -0400 X-Greylist: delayed 394 seconds by postgrey-1.27 at vger.kernel.org; Thu, 14 Mar 2019 11:09:35 EDT Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 0BE605C5A0; Thu, 14 Mar 2019 11:03:05 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=/zXPjEN6fy8KAleL/49vkFad2 mE=; b=bpuHRwslqjEdpyzbqfhwvoiZayUCiXZpdrQrz1DV4FtXZMudmy52dt7cn KXDKFKVTrnaV+ZcTJcdnqU5gjQdSgQ3QDlEzCHmHpCJ71qOcdwxIFBedPqrsknul Z+HWxWnUqvjpOFp2lqeTB0JjLeCkOHNjEAz1DlnznmzUUgO7bY= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 03E6D5C59E; Thu, 14 Mar 2019 11:03:05 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=mesmtp; bh=HQWqSnKUq9mnZy+XYe3QbiEcs2ioWpwtOwXJU6NAABY=; b=gtgteioOKPAv08dVJBDYAM8sKqWeJObcoHRLLrtvHiMgugsmLvG1ipmPoMa5bep4H5cLwBXPHsQkbaY86GXH8Yc0hq8QgHEzBx8i+eBD0M+QFcs4D/bS2RTyVWu3xNcf1ILoMpNa8g4e+UGS0GwCQ4hiTk0Wxbh4jj0ub4WYNdY= Received: from hylob.dartmouth.edu (unknown [129.170.31.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 390915C597; Thu, 14 Mar 2019 11:03:01 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer To: git@vger.kernel.org Cc: debian@onerussian.com, Kyle Meyer Subject: [PATCH 2/4] t3000: move non-submodule repo test to separate file Date: Thu, 14 Mar 2019 11:02:17 -0400 Message-Id: <20190314150219.2040-3-kyle@kyleam.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314150219.2040-1-kyle@kyleam.com> References: <20190314150219.2040-1-kyle@kyleam.com> MIME-Version: 1.0 X-Pobox-Relay-ID: 438200F8-466A-11E9-AD63-D01F9763A999-24757444!pb-smtp20.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP a2d5156c2b (resolve_gitlink_ref: ignore non-repository paths, 2016-01-22) added a test to t3000-ls-files-others.sh to check that 'ls-files -o' does not die() when given a subdirectory that looks like a repository but is actually a subdirectory containing a bogus .git file. Move this test to a separate file in preparation for testing scenarios with non-submodule repositories that are not bogus. Signed-off-by: Kyle Meyer --- t/t3000-ls-files-others.sh | 7 ------- t/t3009-ls-files-others-nonsubmodule.sh | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) create mode 100755 t/t3009-ls-files-others-nonsubmodule.sh diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh index afd4756134..b4f9fc4580 100755 --- a/t/t3000-ls-files-others.sh +++ b/t/t3000-ls-files-others.sh @@ -65,13 +65,6 @@ test_expect_success '--no-empty-directory hides empty directory' ' test_cmp expected3 output ' -test_expect_success 'ls-files --others handles non-submodule .git' ' - mkdir not-a-submodule && - echo foo >not-a-submodule/.git && - git ls-files -o >output && - test_cmp expected1 output -' - test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' ' git init super && git init sub && diff --git a/t/t3009-ls-files-others-nonsubmodule.sh b/t/t3009-ls-files-others-nonsubmodule.sh new file mode 100755 index 0000000000..cc66a4a14d --- /dev/null +++ b/t/t3009-ls-files-others-nonsubmodule.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +test_description='test git ls-files --others with non-submodule repositories' + +. ./test-lib.sh + +test_expect_success 'setup: expected output' ' + cat >expected <<-EOF + expected + output + EOF +' + +test_expect_success 'ls-files --others handles non-submodule .git' ' + mkdir not-a-submodule && + echo foo >not-a-submodule/.git && + git ls-files -o >output && + test_cmp expected output +' + +test_done From patchwork Thu Mar 14 15:02:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 10853059 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 6FEEA6C2 for ; Thu, 14 Mar 2019 15:09:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58204292FA for ; Thu, 14 Mar 2019 15:09:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48C672A0BD; Thu, 14 Mar 2019 15:09:43 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 DC484292FA for ; Thu, 14 Mar 2019 15:09:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726886AbfCNPJm (ORCPT ); Thu, 14 Mar 2019 11:09:42 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:62062 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726691AbfCNPJh (ORCPT ); Thu, 14 Mar 2019 11:09:37 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 26D3F5C5A4; Thu, 14 Mar 2019 11:03:08 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=Ln+3RKIc4+1gtv687vJ+Y+jNx zw=; b=NsRRbfhLw+5RNtbByFkv8rPqUedKrcY7M5ZbAqqjEbZJ2znyeJLCvomyx ZnPepPLcK94bJiSMhvFZ/VWbFz81jQFlFh4RuLdOjKizfRYhvpdAsYFTymc+pCqj DqJJLWq3K9XVkboRLC02Bf3Pc7UHrTxO7pcXgapNpFuUsSIVio= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 1EC5D5C5A3; Thu, 14 Mar 2019 11:03:08 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=mesmtp; bh=8pBgDRBYkQqv/MU3KvmVVM3Y0EvyNV9T1zL4ECxoaaU=; b=qxKdY1DzWTFDQw5E0xCVsobTVGsVtO04XNubGCfREXX02MGbRN8qTZYcJMcuNgbxXbGGZXcuzrO220yYJJcP6GU+l9McXgveJGa59iiFXLhIMrdpR119aZiwBtk+G9+8Ubln7tl+aTrQUkGUtf9W+XZVJe0IWkXlphFoAS0H8/4= Received: from hylob.dartmouth.edu (unknown [129.170.31.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 57F005C59D; Thu, 14 Mar 2019 11:03:04 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer To: git@vger.kernel.org Cc: debian@onerussian.com, Kyle Meyer Subject: [PATCH 3/4] t3009: test that ls-files -o traverses bogus repo Date: Thu, 14 Mar 2019 11:02:18 -0400 Message-Id: <20190314150219.2040-4-kyle@kyleam.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314150219.2040-1-kyle@kyleam.com> References: <20190314150219.2040-1-kyle@kyleam.com> MIME-Version: 1.0 X-Pobox-Relay-ID: 455EC442-466A-11E9-A70A-D01F9763A999-24757444!pb-smtp20.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When a2d5156c2b (resolve_gitlink_ref: ignore non-repository paths, 2016-01-22) added this test, the purpose was to check the 'ls-files -o' didn't die() when processing the bogus repository. The expected output didn't even need to be adjusted for the addition because the bogus repository is treated as an empty directory. Let's add another scenario to test that 'ls-files -o' lists an untracked file within this directory. Doing so isn't useful for the original purpose of the test, but it will be helpful for highlighting that this traversal does _not_ happen in the non-bogus scenarios that will be added next. Rename the original subdirectory to highlight the difference with the new one. Signed-off-by: Kyle Meyer --- t/t3009-ls-files-others-nonsubmodule.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/t/t3009-ls-files-others-nonsubmodule.sh b/t/t3009-ls-files-others-nonsubmodule.sh index cc66a4a14d..9ed75928aa 100755 --- a/t/t3009-ls-files-others-nonsubmodule.sh +++ b/t/t3009-ls-files-others-nonsubmodule.sh @@ -1,6 +1,14 @@ #!/bin/sh -test_description='test git ls-files --others with non-submodule repositories' +test_description='test git ls-files --others with non-submodule repositories + +This test runs git ls-files --others with the following working tree: + + repo-bogus-no-files/ + directory with no files aside from a bogus .git file + repo-bogus-untracked-file/ + directory with a bogus .git file and another untracked file +' . ./test-lib.sh @@ -8,12 +16,19 @@ test_expect_success 'setup: expected output' ' cat >expected <<-EOF expected output + repo-bogus-untracked-file/untracked EOF ' +test_expect_success 'setup: directories' ' + mkdir repo-bogus-no-files && + echo foo >repo-bogus-no-files/.git && + mkdir repo-bogus-untracked-file && + echo foo >repo-bogus-untracked-file/.git && + : >repo-bogus-untracked-file/untracked +' + test_expect_success 'ls-files --others handles non-submodule .git' ' - mkdir not-a-submodule && - echo foo >not-a-submodule/.git && git ls-files -o >output && test_cmp expected output ' From patchwork Thu Mar 14 15:02:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 10853055 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 C4BF61669 for ; Thu, 14 Mar 2019 15:09:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE5492A0C4 for ; Thu, 14 Mar 2019 15:09:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A2AD72A199; Thu, 14 Mar 2019 15:09:40 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 0E6542A0C4 for ; Thu, 14 Mar 2019 15:09:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726736AbfCNPJh (ORCPT ); Thu, 14 Mar 2019 11:09:37 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:54271 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726629AbfCNPJh (ORCPT ); Thu, 14 Mar 2019 11:09:37 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 426E25C5A8; Thu, 14 Mar 2019 11:03:11 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=74xv6UM0j2BZnrv2w9q/wnYO5 bw=; b=HdYKahxd8s4/63MjWU7/Og8bc/aobEsOrtHZjlpe+rFJH0ysKuoQwPsc+ 8j1afMsAZWxsFNxrvYPfeCC8ql7VUrY4JRH+UrekYxMI1JgXAItTS4qOpyHMjiUi v1HsYV++bT8+WJfy+neajk/Czx96XvKJzR6jp8YdIVgVe1Veg8= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 3B2C65C5A7; Thu, 14 Mar 2019 11:03:11 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=mesmtp; bh=9N75kEzyWaWhMWYHfD6WhxOj/85mJoxLTWMSyfxupD0=; b=GbsWU+lctdGwHcmI4fYeq2PMwsmKgoGT2WimfX+CKIUUMDy4IvNwW7O3z8UfAxR8laOwKOHjoYZAb/quL4jhizuIlayRpNP7J4HVHTWuGKagAx0uch051eT3zeyVzTgWn+xNd/Qh5UxizUpelKyCCs2MEp9yw8MGdqOBU0egfoE= Received: from hylob.dartmouth.edu (unknown [129.170.31.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 730E55C5A2; Thu, 14 Mar 2019 11:03:07 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer To: git@vger.kernel.org Cc: debian@onerussian.com, Kyle Meyer Subject: [PATCH 4/4] dir: do not traverse repositories with no commits Date: Thu, 14 Mar 2019 11:02:19 -0400 Message-Id: <20190314150219.2040-5-kyle@kyleam.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314150219.2040-1-kyle@kyleam.com> References: <20190314150219.2040-1-kyle@kyleam.com> MIME-Version: 1.0 X-Pobox-Relay-ID: 4739A156-466A-11E9-9209-D01F9763A999-24757444!pb-smtp20.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When treat_directory() encounters a directory that is not in the index and DIR_NO_GITLINKS is unset, it calls resolve_gitlink_ref() to decide if a directory looks like a repository, in which case the directory won't be traversed. As a result, 'status -uall' and 'ls-files -o' will show only the directory, even when there are untracked files within the directory. For the unusual case where a repository doesn't have any commits, resolve_gitlink_ref() returns -1 because HEAD cannot be resolved, and the directory is treated as a normal directory (i.e. traversal does not stop at the repository boundary). The status and ls-files commands above list untracked files within the repository rather than showing only the top-level directory. The above case is a corner case in an already unusual situation of the working tree containing a repository that is not a tracked submodule, but we might as well treat anything that looks like a repository consistently. Loosen the "looks like a repository" criteria in treat_directory() by replacing resolve_gitlink_ref() with is_nonbare_repository_dir(), one of the checks that is performed downstream when resolve_gitlink_ref() is called with an empty repository. As the required update to t3700-add shows, being looser with the check means that we're stricter when adding empty repositories to the index: % git add repo warning: adding embedded git repository: repo hint: You've added another git repository inside your current repository. hint: [...] error: unable to index file 'repo/' fatal: adding files failed That error message isn't particularly helpful in this situation, but it seems preferable to the old behavior of adding the repository's untracked files. And if the caller really wants the previous behavior, they can get it by adding a trailing slash. Signed-off-by: Kyle Meyer --- dir.c | 6 ++++-- t/t3009-ls-files-others-nonsubmodule.sh | 22 +++++++++++++++++++++- t/t3700-add.sh | 1 + 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dir.c b/dir.c index b2cabadf25..a4e59eb351 100644 --- a/dir.c +++ b/dir.c @@ -1467,9 +1467,11 @@ static enum path_treatment treat_directory(struct dir_struct *dir, return path_none; } if (!(dir->flags & DIR_NO_GITLINKS)) { - struct object_id oid; - if (resolve_gitlink_ref(dirname, "HEAD", &oid) == 0) + struct strbuf sb = STRBUF_INIT; + strbuf_addstr(&sb, dirname); + if (is_nonbare_repository_dir(&sb)) return exclude ? path_excluded : path_untracked; + strbuf_release(&sb); } return path_recurse; } diff --git a/t/t3009-ls-files-others-nonsubmodule.sh b/t/t3009-ls-files-others-nonsubmodule.sh index 9ed75928aa..be4e7e26bc 100755 --- a/t/t3009-ls-files-others-nonsubmodule.sh +++ b/t/t3009-ls-files-others-nonsubmodule.sh @@ -8,6 +8,14 @@ This test runs git ls-files --others with the following working tree: directory with no files aside from a bogus .git file repo-bogus-untracked-file/ directory with a bogus .git file and another untracked file + repo-no-commit-no-files/ + git repository without a commit or a file + repo-no-commit-untracked-file/ + git repository without a commit but with an untracked file + repo-with-commit-no-files/ + git repository with a commit and no untracked files + repo-with-commit-untracked-file/ + git repository with a commit and an untracked file ' . ./test-lib.sh @@ -17,6 +25,10 @@ test_expect_success 'setup: expected output' ' expected output repo-bogus-untracked-file/untracked + repo-no-commit-no-files/ + repo-no-commit-untracked-file/ + repo-with-commit-no-files/ + repo-with-commit-untracked-file/ EOF ' @@ -25,7 +37,15 @@ test_expect_success 'setup: directories' ' echo foo >repo-bogus-no-files/.git && mkdir repo-bogus-untracked-file && echo foo >repo-bogus-untracked-file/.git && - : >repo-bogus-untracked-file/untracked + : >repo-bogus-untracked-file/untracked && + git init repo-no-commit-no-files && + git init repo-no-commit-untracked-file && + : >repo-no-commit-untracked-file/untracked && + git init repo-with-commit-no-files && + git -C repo-with-commit-no-files commit --allow-empty -mmsg && + git init repo-with-commit-untracked-file && + test_commit -C repo-with-commit-untracked-file msg && + : >repo-with-commit-untracked-file/untracked ' test_expect_success 'ls-files --others handles non-submodule .git' ' diff --git a/t/t3700-add.sh b/t/t3700-add.sh index be582a513b..5a8425962b 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -396,6 +396,7 @@ test_expect_success 'no file status change if no pathspec is given in subdir' ' ' test_expect_success 'all statuses changed in folder if . is given' ' + rm -fr empty && git add --chmod=+x . && test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 && git add --chmod=-x . &&