From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 8754B1F8C2 for ; Thu, 11 Feb 2021 22:18:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229938AbhBKWPr (ORCPT ); Thu, 11 Feb 2021 17:15:47 -0500 Received: from mout.gmx.net ([212.227.17.21]:60323 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230054AbhBKWPm (ORCPT ); Thu, 11 Feb 2021 17:15:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613081639; bh=DNhjjln8ea31UyO/sjfoHB4OvYiL0+ME4vKy8c0AqTQ=; h=X-UI-Sender-Class:Date:From:To:cc:Subject:In-Reply-To:References; b=ECXjkV/gVfVIKkBkIJUUpeoxt5SydX8KD4RH7EOSehJc7E1il/OF3W3eKsBjkoIjF QMoD2YkOIY0n69+8+BJhAJzXN+z7lXd6zCZgrKr2LWstuX2rhYW5fgUYZv2G4pSxqx BPv6JIg7aP0VZ9+qk4fzot9Ohm8Ubebi58ixGxuM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [172.19.95.40] ([213.196.212.209]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MjS9C-1ldINR2EV0-00ksxV; Thu, 11 Feb 2021 23:13:59 +0100 Date: Thu, 11 Feb 2021 23:13:56 +0100 (CET) From: Johannes Schindelin X-X-Sender: virtualbox@gitforwindows.org To: =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0_Bjarmason?= cc: git@vger.kernel.org, Junio C Hamano , =?UTF-8?Q?SZEDER_G=C3=A1bor?= , Jiang Xin Subject: Re: [PATCH 09/12] test libs: rename "diff-lib" to "lib-diff" In-Reply-To: <20210209214159.22815-10-avarab@gmail.com> Message-ID: References: <20210209214159.22815-1-avarab@gmail.com> <20210209214159.22815-10-avarab@gmail.com> User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323328-1843824481-1613081640=:29765" X-Provags-ID: V03:K1:4jDcPLa7PvUB3voPTuIewBtZMWlfSz3NTQACT+O2Lu1AQdv2SMo FIMQ1aDU72qc7tcycP2wqgYR3l2jHXgzSt80Zg8BP2763N30TFmAKfEgZ4Nm/Kg/mQ8p7Pd 67Lh7TAd8uPWTzzc25WTSCknIryeUFuJHvo14wvexpU96/3dlt3WMVppquiW/p1UNzjs0bc 4+EzN4sj89sJpsBMVzKuw== X-UI-Out-Filterresults: notjunk:1;V03:K0:yTUsN+SpiuQ=:+TgnlqAYSiUPJj+gWEk3Vw GBCHJjitTiTrCZKdxQHiYobWuyVrrsRvbSZFWmic3aTRgl2/d9ZUjSqfcfh4YNZrUB6ExFDvJ f5prCy16co0IFJtuSCL3WixPBUmyEwYotIMB03Au6jWC3ahij4H8xUtnCb9mvx+97BMKkRjyW HjZwSB7VpcpySXShS9PUOhnKXTSQI1NWZFSas3UHWh+81ZyhE3I31yC+blurNjfIg/B/J2DYB TzZu/jWRFuJuHF533+yoH9uSnaW5Tg1HCVwsVWfRUTFSpMXitgWbJZXypoJJv5RiZsQznFLCp jn1yWiASPg+WU09uINMM4iiRP1pSSTF290Urh9OTtHEPcO3UB3hPO7cneO/fBFruZcNt6CFiR uJM2mQe7+rnt4UiFsk/EcRKmDiPRAE9lgVWBa6rUaN/R+igE9lpSswGsiVh7z09GB5H9573yN Po2xAkbvdgSSKUHwPJ/CMTJCHxaL68Aya2u24Da+rkDNl1mxiN5rdUl2aerw2Fo0aDyw+B6xr AVgdjzUeiMCItuziOQKM12jodIkkHqOlo49LAp76UREPgCGnIZf3XyGSoqWmBJLegx3OcFBts P8Z/nlbRhezS8FPG/v3V/YRoX5VbIN4Ud5ZEb1G082gujXd6sdLjWCOx2onKqiae8yIu5CRCE AgeqWcp+4g7aawNuw5TjUgSkZgp0wwsJYD3C/yGe0NtVvGLTGRNUQ40FLCWfH0/SK2WQgFm3D JvwkkihQiegLoiZUxYRALhlpA9qMxOyWzPhayaRrBxDzLtnUMLggdTPvK2Ig6oXj4+R2eLs5f Z5DmXLRmHR7O7dpEXRtvL25ohQyHo/nsIAMIOIL+R5mDLEOlMAblAg30T/1Z23Ay61a0KVdo1 5pvp5IRhT1WfZxaHxnJGE7GwR86z6lvH39ffE69LQ= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-1843824481-1613081640=:29765 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi =C3=86var, On Tue, 9 Feb 2021, =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason wrote: > diff --git a/t/.gitattributes b/t/.gitattributes > index d778bfad052..dafa17c3e61 100644 > --- a/t/.gitattributes > +++ b/t/.gitattributes > @@ -1,6 +1,6 @@ > t[0-9][0-9][0-9][0-9]/* -whitespace > /chainlint/*.expect eol=3Dlf > -/diff-lib/* eol=3Dlf > +/lib-diff/* eol=3Dlf > /t0110/url-* binary > /t3206/* eol=3Dlf > /t3900/*.txt eol=3Dlf Lucky coincidence that this is still sorted ;-) The patch looks good to me. Thanks! Dscho > diff --git a/t/diff-lib.sh b/t/lib-diff.sh > similarity index 100% > rename from t/diff-lib.sh > rename to t/lib-diff.sh > diff --git a/t/diff-lib/COPYING b/t/lib-diff/COPYING > similarity index 100% > rename from t/diff-lib/COPYING > rename to t/lib-diff/COPYING > diff --git a/t/diff-lib/README b/t/lib-diff/README > similarity index 100% > rename from t/diff-lib/README > rename to t/lib-diff/README > diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh > index e5116a76a1c..cce334981e1 100755 > --- a/t/t4000-diff-format.sh > +++ b/t/t4000-diff-format.sh > @@ -7,7 +7,7 @@ test_description=3D'Test built-in diff output engine. > > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > echo >path0 'Line 1 > Line 2 > diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh > index c16486a9d41..2f9700742aa 100755 > --- a/t/t4001-diff-rename.sh > +++ b/t/t4001-diff-rename.sh > @@ -7,7 +7,7 @@ test_description=3D'Test rename detection in diff engine= . > > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > test_expect_success 'setup' ' > cat >path0 <<-\EOF && > diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh > index df2accb6555..db07ff3eb19 100755 > --- a/t/t4003-diff-rename-1.sh > +++ b/t/t4003-diff-rename-1.sh > @@ -7,11 +7,11 @@ test_description=3D'More rename detection > > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash > +. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash > > test_expect_success \ > 'prepare reference tree' \ > - 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING && > + 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING && > echo frotz >rezrov && > git update-index --add COPYING rezrov && > tree=3D$(git write-tree) && > @@ -99,7 +99,7 @@ test_expect_success \ > > test_expect_success \ > 'prepare work tree once again' \ > - 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING && > + 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING && > git update-index --add --remove COPYING COPYING.1' > > # tree has COPYING and rezrov. work tree has COPYING and COPYING.1, > diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlin= k.sh > index 6e562c80d12..3d495e37bb1 100755 > --- a/t/t4004-diff-rename-symlink.sh > +++ b/t/t4004-diff-rename-symlink.sh > @@ -10,7 +10,7 @@ copy of symbolic links, but should not produce rename/= copy followed > by an edit for them. > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > test_expect_success SYMLINKS \ > 'prepare reference tree' \ > diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh > index d18a80493c2..86479061325 100755 > --- a/t/t4005-diff-rename-2.sh > +++ b/t/t4005-diff-rename-2.sh > @@ -6,10 +6,10 @@ > test_description=3D'Same rename detection as t4003 but testing diff-raw= .' > > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash > +. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash > > test_expect_success 'setup reference tree' ' > - cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING && > + cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING && > echo frotz >rezrov && > git update-index --add COPYING rezrov && > tree=3D$(git write-tree) && > @@ -64,7 +64,7 @@ test_expect_success 'validate output from rename/copy = detection (#2)' ' > # nows how to say Copy. > > test_expect_success 'validate output from rename/copy detection (#3)' ' > - cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING && > + cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING && > git update-index --add --remove COPYING COPYING.1 && > > cat <<-EOF >expected && > diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh > index b187b7f6c66..cbb9c62f535 100755 > --- a/t/t4007-rename-3.sh > +++ b/t/t4007-rename-3.sh > @@ -7,17 +7,17 @@ test_description=3D'Rename interaction with pathspec. > > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash > +. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash > > test_expect_success 'prepare reference tree' ' > mkdir path0 path1 && > - cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING && > + cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING && > git update-index --add path0/COPYING && > tree=3D$(git write-tree) && > echo $tree > ' > > -blob=3D$(git hash-object "$TEST_DIRECTORY/diff-lib/COPYING") > +blob=3D$(git hash-object "$TEST_DIRECTORY/lib-diff/COPYING") > test_expect_success 'prepare work tree' ' > cp path0/COPYING path1/COPYING && > git update-index --add --remove path0/COPYING path1/COPYING > diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.= sh > index b1ccd4102e0..2299f27511b 100755 > --- a/t/t4008-diff-break-rewrite.sh > +++ b/t/t4008-diff-break-rewrite.sh > @@ -22,11 +22,11 @@ With -B, this should be detected as two complete rew= rites. > Further, with -B and -M together, these should turn into two renames. > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash > +. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash > > test_expect_success setup ' > - cat "$TEST_DIRECTORY"/diff-lib/README >file0 && > - cat "$TEST_DIRECTORY"/diff-lib/COPYING >file1 && > + cat "$TEST_DIRECTORY"/lib-diff/README >file0 && > + cat "$TEST_DIRECTORY"/lib-diff/COPYING >file1 && > blob0_id=3D$(git hash-object file0) && > blob1_id=3D$(git hash-object file1) && > git update-index --add file0 file1 && > diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh > index b63bdf031f5..b1da807f169 100755 > --- a/t/t4009-diff-rename-4.sh > +++ b/t/t4009-diff-rename-4.sh > @@ -7,11 +7,11 @@ test_description=3D'Same rename detection as t4003 but= testing diff-raw -z. > > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash > +. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash > > test_expect_success \ > 'prepare reference tree' \ > - 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING && > + 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING && > echo frotz >rezrov && > git update-index --add COPYING rezrov && > orig=3D$(git hash-object COPYING) && > @@ -81,7 +81,7 @@ test_expect_success \ > > test_expect_success \ > 'prepare work tree once again' \ > - 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING && > + 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING && > git update-index --add --remove COPYING COPYING.1' > > git diff-index -z -C --find-copies-harder $tree >current > diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh > index 65cc703c659..1bbced79ece 100755 > --- a/t/t4010-diff-pathspec.sh > +++ b/t/t4010-diff-pathspec.sh > @@ -10,7 +10,7 @@ Prepare: > path1/file1 > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash > +. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash > > test_expect_success \ > setup \ > diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh > index 717034bb50b..5a25c259fe3 100755 > --- a/t/t4011-diff-symlink.sh > +++ b/t/t4011-diff-symlink.sh > @@ -7,7 +7,7 @@ test_description=3D'Test diff of symlinks. > > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > # Print the short OID of a symlink with the given name. > symlink_oid () { > diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh > index ce6aa3914fe..fcc30d8cc26 100755 > --- a/t/t4013-diff-various.sh > +++ b/t/t4013-diff-various.sh > @@ -9,7 +9,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=3Dmaster > export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME > > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > test_expect_success setup ' > > diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh > index 8c574221b27..2c13b62d3c6 100755 > --- a/t/t4015-diff-whitespace.sh > +++ b/t/t4015-diff-whitespace.sh > @@ -7,7 +7,7 @@ test_description=3D'Test special whitespace in diff engi= ne. > > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > test_expect_success "Ray Lehtiniemi's example" ' > cat <<-\EOF >x && > diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh > index 894a11b224d..94ef77e1dfe 100755 > --- a/t/t4027-diff-submodule.sh > +++ b/t/t4027-diff-submodule.sh > @@ -3,7 +3,7 @@ > test_description=3D'difference in submodules' > > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > test_expect_success setup ' > test_tick && > diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh > index 0c8fb39ceda..56f1e62a97b 100755 > --- a/t/t4034-diff-words.sh > +++ b/t/t4034-diff-words.sh > @@ -3,7 +3,7 @@ > test_description=3D'word diff colors' > > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > cat >pre.simple <<-\EOF > h(4) > diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh > index 09ad491a593..aeac203c424 100755 > --- a/t/t4038-diff-combined.sh > +++ b/t/t4038-diff-combined.sh > @@ -6,7 +6,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=3Dmain > export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME > > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > setup_helper () { > one=3D$1 branch=3D$2 side=3D$3 && > diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh > index bcf7493740a..7750b87ca16 100755 > --- a/t/t4061-diff-indent.sh > +++ b/t/t4061-diff-indent.sh > @@ -7,7 +7,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=3Dmain > export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME > > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > # Compare two diff outputs. Ignore "index" lines, because we don't > # care about SHA-1s or file modes. > diff --git a/t/t4206-log-follow-harder-copies.sh b/t/t4206-log-follow-ha= rder-copies.sh > index ad29e65fcba..4871a5dc92f 100755 > --- a/t/t4206-log-follow-harder-copies.sh > +++ b/t/t4206-log-follow-harder-copies.sh > @@ -7,7 +7,7 @@ test_description=3D'Test --follow should always find cop= ies hard in git log. > > ' > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh > +. "$TEST_DIRECTORY"/lib-diff.sh > > echo >path0 'Line 1 > Line 2 > diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basi= c-functionality.sh > index 0f936182e4f..512ae2781fe 100755 > --- a/t/t7501-commit-basic-functionality.sh > +++ b/t/t7501-commit-basic-functionality.sh > @@ -11,7 +11,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=3Dmain > export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME > > . ./test-lib.sh > -. "$TEST_DIRECTORY/diff-lib.sh" > +. "$TEST_DIRECTORY/lib-diff.sh" > > author=3D'The Real Author ' > > diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh > index 3d17e932a0e..3d77701fd4d 100755 > --- a/t/t9300-fast-import.sh > +++ b/t/t9300-fast-import.sh > @@ -8,7 +8,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=3Dmain > export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME > > . ./test-lib.sh > -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash > +. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash > > verify_packs () { > for p in .git/objects/pack/*.pack > -- > 2.30.0.284.gd98b1dd5eaa7 > > --8323328-1843824481-1613081640=:29765--