From patchwork Thu May 21 09:52:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11562581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F4A790 for ; Thu, 21 May 2020 09:52:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77678206BE for ; Thu, 21 May 2020 09:52:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=web.de header.i=@web.de header.b="GM+Qv2Pc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728954AbgEUJwM (ORCPT ); Thu, 21 May 2020 05:52:12 -0400 Received: from mout.web.de ([212.227.15.3]:57337 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728834AbgEUJwM (ORCPT ); Thu, 21 May 2020 05:52:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1590054725; bh=1tc0yJJDA/sJje+rQPUpUy0LH5uEqYfEi2wU+MUERio=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=GM+Qv2PchX1jzJS7tQ5p5QTvTA7O+F6uKh5KeP1eFw7XY6snlI1H9j+kJ1A7N0MXB tc9jtIKtkFQzDr+S8xoLJ2R/XYu7jNFfqe4zu17nvxocHU1HEYJrG+cyTCT0IpYB1I M4sV31gnrR45sFE9uRJySH+1JLBf7kxlh05cKD+4= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.26] ([79.203.24.188]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LshCr-1iwHIz3mwr-012FzR; Thu, 21 May 2020 11:52:04 +0200 Subject: [PATCH 1/4] fsck: fix a typo in a comment To: Junio C Hamano Cc: Brandon Williams , git , Jeff King References: <938f0818-7e57-b883-009f-01db88ef8f65@web.de> <2937d635-52a9-5e69-b3d2-fbde415b7315@web.de> From: =?utf-8?q?Ren=C3=A9_Scharfe?= Message-ID: <0e34ddca-1e29-17ed-278c-4f94ed6436b3@web.de> Date: Thu, 21 May 2020 11:52:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:+qTIBWH6ATr7iJT4XZzheyavA7Ad/qhZ9I5abebsHeA32HT9M1B in6LV7vlE4rywtDcLoPa5wD9+BmfvmZonUzsq0F8xZA0nRST85+lrl8F4VFxk/JyOzgU0xj E/7K4U0D0j24Oenn4dv0aeyv57GplRTIOZMznzCYAdtDxFf81DrBrTsnb/R4VyKbdBmdhSP fjwREqWn6s/BH5IfTlU5w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Erf7JlbvmrU=:lv2RcBGjFjgQ8MKqiMrY1j urTS+HNMB6/yXb/RMZcqJw94BXX7ayiPL07YrwwQzMAugu8nnwEHp1gS+ndn1qSRjHuR6zzZk 6f0Uk/FVDIDSxZhDEr05oTznerjZWiAUkvtpgH1HW/9PRS7sEDIgJCKxVI22xrJbu/vX5Io7C zxgWJlJyyX8s1c9HmL22tB5q7gWDE4orhr4OHoSFG0WtDQszt5YvMWR9xAMFkw1dJGxnNuH1W RgmDNMV4vJXljDvZxEcw/Tix8KmWH/0z9z4b27NBRWrOAJTDsrE93v1FNmuzYg4RvMaEHun3k tVsprieutvACRJUD4ukG5tfIstZFwV7w/08VbiBa+hM7N4TZdDldBVExqKkpxPX8ZMRWYWzY9 Ou/Nm6/qL8qAxQHzkGBQxJ2KfgPUmWXNsP5EmZnAv/f6mZXa1qvquqXjsG+bgAFvV4m9d9NdJ NqwB+/AEksIB9PpM4YRj5ufgZJ5LdBGpTu303enmgm8q8tYhBFdQkjUGIlBj7xIvx2NHs2tLY 0sQirssbR/3FgwQBp+LE00MxN8cOrVNbdojvST9TB6Ku5hZG19ni80K+k2x5uQBNLyRlgW3bO yXwyyLUHsfPRZStu/ivn+9DOl1gdU/yZLW5pPks4J1JzXHuUlEapgYPZPhPQaO+ypr89GSRZ/ hwyh2PXmyI/7VqY3Ten/5lb+T1bql5Vm8wAnoFv/5XMGNs+rxgLJkJmzwbU/6o35NNACmQQwT dBm2IFX6fTtxcEQ7bJRkDtBXUuzrOPZDMYJJ/zyyGw2+ebY8ouxatfYiMytdKQAMqyKxlgV+w BkTRZ9AYiiYHMm/jEpcE3KiSoWnPOeUVMQCmh32Jagu6MwLkgeat6DWM334B8w1z/g/59lDhW vcJHOQfyc+QFzKtMhEmRQ07ZHJyyOKG41YDzlwsqeREEUNf1oM5WMj4ahnLq7d0u9fcj4WByX yj6f8bGl0yMW83uztK3kXq556H6E87QBJ/xmIynCL7ZIlw3gSUUZZoOCg3WAsQnju6BirIn6J bR9rTrJl+IFlv5xXvx0YnE2Oh3WlEKJJMfwQFITimubjVm3CcA3BJ8rWZy0BR7dM+iTdoSVPY gUckU9ShHWvWTuzhkJ9JadhZPcoH4cWD+mLIUUQI5kN++6eFuQ8CvEsWZdK8YtxNRK6hBesiy GMECudOqIIn1lQmkooDOAnOGcwO1Qpy6hP7LQCe6kEOmQjf5TAHR3YIOsK3KmuDc8enRylocG v0taEra5MYv56Wbo+ Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Reported-by: Junio C Hamano Signed-off-by: René Scharfe --- fsck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.26.2 diff --git a/fsck.c b/fsck.c index 8bb3ecf282..b48426262c 100644 --- a/fsck.c +++ b/fsck.c @@ -598,7 +598,7 @@ static int verify_ordered(unsigned mode1, const char *name1, /* * There can be non-consecutive duplicates due to the implicitly - * add slash, e.g.: + * added slash, e.g.: * * foo * foo.bar From patchwork Thu May 21 09:52:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11562583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96FEC90 for ; Thu, 21 May 2020 09:52:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7DDE4206BE for ; Thu, 21 May 2020 09:52:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=web.de header.i=@web.de header.b="c7tUG9ZA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726953AbgEUJwg (ORCPT ); Thu, 21 May 2020 05:52:36 -0400 Received: from mout.web.de ([212.227.15.3]:38225 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726871AbgEUJwg (ORCPT ); Thu, 21 May 2020 05:52:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1590054750; bh=9T4SW+r6biplOJwSrg66XBROfmNGjop7Nwmv5kT8zT4=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=c7tUG9ZAmV7WVaA3gcR1b1eNPfau+gEESjqzsUe+KFxSslDbegiLXXNBgPbFAs6Rt LdChk0UqdWME3orS/T4qTxKFs91cBZUCHVaylUF+4J16vIY6YKnVH017KEUXVQD94Q W30agO5OHLKUEpK8D+Jev3sQmyORIi6G60gTwRFw= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.26] ([79.203.24.188]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MLxrY-1jhD733fVE-007nUH; Thu, 21 May 2020 11:52:29 +0200 Subject: [PATCH 2/4] t1450: increase test coverage of in-tree d/f detection To: Junio C Hamano Cc: Brandon Williams , git , Jeff King References: <938f0818-7e57-b883-009f-01db88ef8f65@web.de> <2937d635-52a9-5e69-b3d2-fbde415b7315@web.de> From: =?utf-8?q?Ren=C3=A9_Scharfe?= Message-ID: <106c58e1-9c74-46e3-c83a-88eee114d9d6@web.de> Date: Thu, 21 May 2020 11:52:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:Vdy2V8EgEqr0mtMhh3qcOkhnW/6oD3wIr/TdZA6oJcbhuIfa75I 8AglESiLNEu1jKuMl+bAoG1CyA1dHT1P7fz1s/CIhKgm8Cbm1JwHwvCw+s0X/upcJ09kguA JlYhbqPukh2Emt/C94BA7qcW+FXHBMdS+qINPOGBrSIKDDy3COyQP1VPFJe9vkFyHP84KRt 8WVejsWk5MTmQf+30thGA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Ioeg4lb5XPE=:ozreVdHpTQl6/ayvkAqFnY tw4NghWFm+gAqUjpvUBFpnT1PS5iXs6WqjIaCrGyBgUlUx4Rmo0mF57mRUVuDGvz2WwztxWJK R1uV7oDwTO6XancnxwuC/g1jOKfgLEP+xwoIgAsUimB+lrDzX0M0SCK7UknBBGuMgucaTU/jb +wE4XAee5dsYgvVMle2ji6eNIMwbGIs78MbQv7LZi4RhtVJOMCVpjBgnaVf37kAWVrscN/LgE rnNbyur/ZKVcz8+45vqxjJr66KTyHG6jd0pnj6tCJ6+ymH3KC3SnbxvI0BAV1ziMWCgjV+usx DQ7V13bmf7NVZnXaEE/5UdX1wRbZ82HZbM9WeBLCcdBmiCJdtNvIZ6GKHKIDxW4W9B50ykoQi C6C/HVmoKVGSuLUcWnEzT2p19hWEKMHfhfK3xUahSbQK7rp5eCoZiJlMVOx3neCO6fU8vGTyf +IdRqYCA/Y8Bs5V50gn5eE+PDrfTdGPB1M0mpp9z9765AAPdQHJ3zU56JCyzhYi2t90gJAhg5 s/u3aonJLGHM+Bcm/esK46nNgB7+vIcSbOdpybnaLusM7hQk+n5IE9l41KgAeXenrUBECOuFg upDFocTjtoaoFsGCjtqet0I1wMx8RFjg0CbK9yFVjv/IWHvsXz2fF5bQHL0W1sDqb0f/WiZ4S lwLaIHmsI07MszjFPzQiYOBpcPoygaSy/KeZpwrvL5cxMsWAT/Tf8LjwZ7j0qsL0oSZrcgqPM OjBv++YSKfcAaAfmK/u9STB3MqDh3SnXnNm8cMPz4cXXdHih10QIrsyEuOdrPtbdgEpXBIWQ1 Eb2VSiQTGxb6tAUpja3jCWnsTdODE7yjX9NKPOpDjJ3pGIol/gqSugWJWnonhAYxX79P3C5Ap 9jpL6f5pNZw3WI3NkxD7/THFBWsICmWbJIYITzPfeqtW9SNf/AsFAEkwrh/fyGNUmXLda0f4b JMJBeuyRwns51H9uX8b3TrgYCjFQGPznv6z03Bq8vms6mshYy5bDbGA8men6UPplaM7rIsXeS MAFUcnjjRZ60/MbxAwCbwT2DVbkFOcQ7JriMpLGe0FErp4FG29M12ROT5yNf1UMdLgZe6NkyV UuyE51XAgvIWcFdzwh+cTJnfFqdnnW9/R7UnpUzc709oHRfcMcBFOTkhX7UOdD9vH2YRLabiY DLNkq3eOxdvaC+ec7Bw0rSYOuodkYC/MzMBzJPjLlYrel5RC9zl63Vci+VyzGt4IolP1g= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Exercise the case of putting a conflict candidate file name back on the stack because a matching directory might yet come up later. Do that by factoring out the test code into a function to allow for more concise notation in the form of parameters indicating names of trees (with trailing slash) and blobs (without trailing slash) in no particular order (they are sorted by git mktree). Then add the new test case as a second function call. Fix a typo in the test title while at it ("dublicate"). Reported-by: Derrick Stolee Signed-off-by: René Scharfe Signed-off-by: René Scharfe --- t/t1450-fsck.sh | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) -- 2.26.2 diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 91a6e34f38..9640ac8ff2 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -257,21 +257,33 @@ test_expect_success 'tree object with duplicate entries' ' test_i18ngrep "error in tree .*contains duplicate file entries" out ' -test_expect_success 'tree object with dublicate names' ' - test_when_finished "remove_object \$blob" && - test_when_finished "remove_object \$tree" && - test_when_finished "remove_object \$badtree" && - blob=$(echo blob | git hash-object -w --stdin) && - printf "100644 blob %s\t%s\n" $blob x.2 >tree && - tree=$(git mktree badtree && - printf "100644 blob %s\t%s\n" $blob x >>badtree && - printf "040000 tree %s\t%s\n" $tree x >>badtree && - badtree=$(git mktree out && - test_i18ngrep "$badtree" out && - test_i18ngrep "error in tree .*contains duplicate file entries" out -' +check_duplicate_names () { + expect=$1 && + shift && + names=$@ && + test_expect_$expect "tree object with duplicate names: $names" ' + test_when_finished "remove_object \$blob" && + test_when_finished "remove_object \$tree" && + test_when_finished "remove_object \$badtree" && + blob=$(echo blob | git hash-object -w --stdin) && + printf "100644 blob %s\t%s\n" $blob x.2 >tree && + tree=$(git mktree badtree && + badtree=$(git mktree out && + test_i18ngrep "$badtree" out && + test_i18ngrep "error in tree .*contains duplicate file entries" out + ' +} + +check_duplicate_names success x x.1 x/ +check_duplicate_names success x x.1.2 x.1/ x/ test_expect_success 'unparseable tree object' ' test_oid_cache <<-\EOF && From patchwork Thu May 21 09:52:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11562585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 44E0390 for ; Thu, 21 May 2020 09:52:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C2DB206BE for ; Thu, 21 May 2020 09:52:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=web.de header.i=@web.de header.b="dLs9jD/j" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726821AbgEUJwt (ORCPT ); Thu, 21 May 2020 05:52:49 -0400 Received: from mout.web.de ([212.227.15.4]:44825 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726353AbgEUJws (ORCPT ); Thu, 21 May 2020 05:52:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1590054764; bh=D/WSjFvuStkunqOxV8wyk6eOFUHFA7QdEhp8KbrFOlM=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=dLs9jD/jaxTNLYimFCXCYyAkfL429twpmLCrecAeeZ8QXHp+Bn3PUzP+NIa6vA/nX hYkrdSc1fUAmZcfdMnbQ4CC7KLVvohODQf3I21+ZD4kXtyhxmettLqr2scS9TYFwSo DjqmETSyeu7+d2rbq/LufiaPa6x5Xk7nlxR+pFvk= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.26] ([79.203.24.188]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MWQyl-1jZCcK3r7D-00XsbZ; Thu, 21 May 2020 11:52:43 +0200 Subject: [PATCH 3/4] t1450: demonstrate undetected in-tree d/f conflict To: Junio C Hamano Cc: Brandon Williams , git , Jeff King References: <938f0818-7e57-b883-009f-01db88ef8f65@web.de> <2937d635-52a9-5e69-b3d2-fbde415b7315@web.de> From: =?utf-8?q?Ren=C3=A9_Scharfe?= Message-ID: Date: Thu, 21 May 2020 11:52:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:uW8t7Vfojp/pbuHOKjHfmP0uCly2I/+HQfQmqvRJwAoT3hYfViv 6fqQynWT0V5CACsI0qRJlse0qHU8bXDCL9ikCJd1opv3jvEX1YwzwdaC1+7jDjGb7ium9Ad hMmOvH/1dv4rSfm0Adzg0cTywcFY52cLpZw6eN91jNZ4ZrWbKt89h062j/vUodunWomyaeI xM1RNvhgKkZNaExwEjttg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:WHJiSOYyluM=:Np+LOP0EyRaESgu0d3Hj35 68o9uOnWYvBYC7/nCCmC3lPIx0YOBP49VeGO3tIN/kCse3KafMmYHKGVAMxQkDt2A7x8dsLKf 0vfBAOw57xN7hjTF2Sgg8uGzo/Qyovd1vlB5RmsICMZXlemsioPNfmY7QWX4GmSzbN30PPT7u tkhIpYtbaNV/8u42O8RrP6hv9jamb0/1RQS7B5+wq/nrWTmmAKgmUfDHK8Uk+/MVK1F98wbqK 4/t2zXtCHeC5Rfq6OUuN8JlVIky1YffUfhzTCp0HOsTj/t2H+dUaGRmnx2S70gY8W5SxhwPkL 2YiZ0/o6HzJcHIGUqKjqykRxNlp1CYXvbPOpIKgZSb+7CUuOWauWnLWR6ZkKDzR7kmCTzA5Hc WlN/KuLuCk2vIRwzgjk9GwqJX1jVJJyG+Us04GtklwV010+JESVxvH/E5vvT8zc42qJ2aMdVK fCJxeFsgzkDhr/A/DQX17ki4YzF2W0Q3zmbBIO+U9YZ5bA6QSulq2ebAxoRWAiX4i2tXYxxYk llNp0wqF0/Hy95iPlONqymowD3psJhUKYX/4Skkq2Hf9BDd5WR9sUYuZiSAwz+3UiXtAylpbU Ee1nOtqlFROlJMFle4fpb6qoerAzhIkHvNQO1P6eQx5e8lxihLORMtP7ZipngYSaIN+WWOMf0 cSWlp8yrBids2MqwWj3dEKwouvUelnHJ6wpIm5Xm+RrPKqmoh5mPg5w27DYnNszvvwlSM/jE4 4RD+JDhilDCgWOqop39TUcZcTLvSznIJPxU78xXS8BonkVohaZBPniOCO0DVFJQiEqlZ8QydM 9nL5q0ppUddCNxxTFxZ4xLdQQL4vwyHfYd5ddcv7VopMKPfkRQHz6svrnCgeCdpsdWfQ8JXYg SO1plidpkc+KSqIw5Npv94JMlweeQQa2R/QUqwXONi+tT00LJEy3IReNOZbgmZDPha5TNisV9 sXp+kupMKJeePQJXe/+JnCI9vMyItP86xQpqik40ZgXNdAZuWvbb3rBadWHpNldFC7r4CLhlA GdN9JSNioQdGR0G8p8afr1cGsdrq1zz0ny3MX5T+Jtr5ZWsvuDZQVsCzjYnTac+inu7lmPEQM KW1zoUdEgdQ0GaMk7KKVXUDw3qFvzhzwYibb91fxfqtPEXr+/5dgCbnrlxcQsgdwnGiHzt1wD hMdaH5J9vLNcpipBFzo+WgwteBeoRGTCLWzIbVNl/nvsZMG+GXOj0MWgepKNCEk1P+kuqrhTE eSnHeh3qWaxhzEBbV Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: René Scharfe --- t/t1450-fsck.sh | 1 + 1 file changed, 1 insertion(+) -- 2.26.2 diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 9640ac8ff2..5780e10cbc 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -284,6 +284,7 @@ check_duplicate_names () { check_duplicate_names success x x.1 x/ check_duplicate_names success x x.1.2 x.1/ x/ +check_duplicate_names failure x x.1 x.1.2 x/ test_expect_success 'unparseable tree object' ' test_oid_cache <<-\EOF && From patchwork Thu May 21 09:52:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Scharfe?= X-Patchwork-Id: 11562587 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A87B490 for ; Thu, 21 May 2020 09:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91195207D3 for ; Thu, 21 May 2020 09:53:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=web.de header.i=@web.de header.b="Y4sfIVCK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726882AbgEUJxA (ORCPT ); Thu, 21 May 2020 05:53:00 -0400 Received: from mout.web.de ([212.227.15.3]:38017 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726353AbgEUJxA (ORCPT ); Thu, 21 May 2020 05:53:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1590054775; bh=xs/ddUgKfZJeZy8w0+Ngy5Hqapwzem0Nj9oMESMS8q0=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=Y4sfIVCK+HLjDo2zM8kPxD3M5DGzP5OZohHD8JTDEqn9ba1Bv54BIGkub3Fs822wa Rc5N3mvE2KZm2XUIJ/UGV4Cxsg2aYha9wxuFVnXqSJ0zzmeBA6peAATklHpATomar4 OFCy06ZPDZcWhPKcoAK7F6gzGDHmfuGPlWGpLxNA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.26] ([79.203.24.188]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MVrbl-1jS2gE0x65-00Rmjl; Thu, 21 May 2020 11:52:55 +0200 Subject: [PATCH 4/4] fsck: detect more in-tree d/f conflicts To: Junio C Hamano Cc: Brandon Williams , git , Jeff King References: <938f0818-7e57-b883-009f-01db88ef8f65@web.de> <2937d635-52a9-5e69-b3d2-fbde415b7315@web.de> From: =?utf-8?q?Ren=C3=A9_Scharfe?= Message-ID: <36ba44ed-d076-12fb-3d28-7b5989c736b7@web.de> Date: Thu, 21 May 2020 11:52:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:CkubMGKS0iqizBQScp9Ss5dEaWhY7hLfqF/zkj+kfpLvdm8yJxB Ls0Va+foehpTEST0nyGdV5WF6WstcvyFLxzpQ88UOdY8dnTvjR4lU/MNTrJ8jbxOU09veeK MTDuuNXXqe4jepY23bEb5UZBrhDLkpLJQ2juAnVhatr5k31g/Vm+DBRzyP+dLc8lVSJW/Dp IUvQEKH0fLmjt00PEuemg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:1UDmio9RNKQ=:LRua6Kol2AA/YIwz/VGDTJ 3Tk33dItYNT15WeP3XYFxG/KdwyDrRP5tz2urg1SxjWJudCtipe6sKO+VFZuUQc65f1Whnxgs msv770Bjq+DvitrFoG8mjke6K1jFy3CXYMdDWK5P1cVeLLhroPcJdqVwlEJWIv+p/bHMRuG7+ TLz1oxbxbWhx++SFYIWmlcFZlM8oUS19PRlHs0RdRhb/2aa4a6qaGDBpXQVJsJx/66N0VAyLV KDsBZ7yeDusD/zfPIsP6kcDW1vuvQ43XtWZSjIXghNPdpI+X7MbAEF0KfZ57Zlg18iYK13htF UXmszV6DA/W2Qt5CBOYelaQ3hSYUvSI1ul7xjHIViRZm1bwVy4SCp/iXBpPHiW8x2tjvWXL6h tiL9byPe+f4ohIuK/JBd+VDAtBWYFBQLylt3g2ewqyzsu71nid4dNBBjb5pFLLW9Zd8Un6yTz +RXiywP6Lo4+rxjjQV18PEizltre8aBzXm+H4gUZY5mWOffcM8wSks7pN/noit87iRAnazU9q bYXPAHCm9x8zwonQWXb27GQ8DRHztOYMxfbw8TTJghIfqGhTjtVmR65fHCsAElUEblxkW2qhn H/hz9Ut5oaTwC0GMZ8MvGdCtZDJZ/R3uiYtw1mfXXHS29TZTmTloMcOs2Me2yNsf/3Hja0K3T ssZcVcbknyc6RqqBEbMNxN3+hW3NB0A4Da/kEOFuP1+u4q1jvMG2yvF3D+A3i4T0mtUt3Bz2i EcHNhB1X7f/FrCyqP5dc5e1Uey0bFVzBJaGKNahuotSP6+xW/vf9k5/5G9VIuh8NgWilSWNZ4 QQIwrSmhLbZSvpNiA4QBKx/k8/JHULPpF2f07HUKkyemugZx5i9ByBghSXBmYYgZXUFuz5cfH kkqPLQsy5T6fOr7RPJVbyJ9zYK422RgNcNnTHDMRWNji4CV4jI9RgeRkdW13+MKgM16Kwm4ed iAXpGiH1+gGSestJ01gehlzv6umj8qvsTUUeqwdSqyWTV+QaVCb1idn5Aj5L+BeO4WjGHpiFd VxpNCU8I4RMDqrLq9jtoR57jowIZyHJLPe3VpveEXpTAz1q8L239pS7X0OLn/4lCanRhrQAbX M0/fMu39zepMpdmyQpZGrZxSr4zgtKUGg7FqbpdWBw4zkk5udvPqBTWSwdxhlxGRQ6l2raRKt VgCJBQk6gGh8+6IiQfdQgzI5VCIMW0bX4owyIfS84J87PFzJnVKDxE6TbodFFXMbMaQnivG6k G3WUGNV+yD+Ua81j2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org If the conflict candidate file name from the top of the stack is not a prefix of the current candiate directory then we can discard it as no matching directory can come up later. But we are not done checking the candidate directory -- the stack might still hold a matching file name, so stay in the loop and check the next candidate file name. Signed-off-by: René Scharfe --- fsck.c | 2 +- t/t1450-fsck.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.26.2 diff --git a/fsck.c b/fsck.c index b48426262c..f82e2fe9e3 100644 --- a/fsck.c +++ b/fsck.c @@ -620,7 +620,7 @@ static int verify_ordered(unsigned mode1, const char *name1, if (!f_name) break; if (!skip_prefix(name2, f_name, &p)) - break; + continue; if (!*p) return TREE_HAS_DUPS; if (is_less_than_slash(*p)) { diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 5780e10cbc..344a2aad82 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -284,7 +284,7 @@ check_duplicate_names () { check_duplicate_names success x x.1 x/ check_duplicate_names success x x.1.2 x.1/ x/ -check_duplicate_names failure x x.1 x.1.2 x/ +check_duplicate_names success x x.1 x.1.2 x/ test_expect_success 'unparseable tree object' ' test_oid_cache <<-\EOF &&