{"thread":{"id":"49269","subject":"test files with same names?","startedAt":"2018-09-03T18:16:28Z","lastAt":"2018-10-23T04:07:15Z","messageCount":21,"participants":["Duy Nguyen","Junio C Hamano","Stephen & Linda Smith","Stefan Beller","Stephen Smith","Stephen P. Smith","Eric Sunshine"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"357245","messageId":"CACsJy8B1UDN26tWPvOtixSBiFF6bYP2BtK2n1u4W-tWdVeKK1A@mail.gmail.com","threadId":"49269","inReplyTo":null,"subject":"test files with same names?","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2018-09-03T18:16:00Z","receivedAt":"2018-09-03T18:16:28Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"We have these test files with the same description:\n\nt0410-partial-clone.sh\nt5616-partial-clone.sh\nt2000-checkout-cache-clash.sh\nt2001-checkout-cache-clash.sh\nt4134-apply-submodule.sh\nt4137-apply-submodule.sh\nt7500-commit.sh\nt7501-commit.sh\nt7502-commit.sh\nt7509-commit.sh\n\npartial-clone files, I can understand since they belong to different\ngroups. But should the remaining files have different descriptions?\nLooking at this it's hard to know why one test should be in this file\nand not the others.\n-- \nDuy\n"},{"id":"357310","messageId":"xmqqwos19nr5.fsf@gitster-ct.c.googlers.com","threadId":"49269","inReplyTo":"CACsJy8B1UDN26tWPvOtixSBiFF6bYP2BtK2n1u4W-tWdVeKK1A@mail.gmail.com","subject":"Re: test files with same names?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-09-04T17:27:26Z","receivedAt":"2018-09-04T17:27:31Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Duy Nguyen writes:\n\n> t2000-checkout-cache-clash.sh\n> t2001-checkout-cache-clash.sh\n\nThese date back to 368f99d5 (\"[PATCH 2/2] The core GIT tests: recent\nadditions and fixes.\", 2005-05-13) which later were renamed by\nf50c9f76 (\"Rename some test scripts and describe the naming\nconvention\", 2005-05-15). One was about checking out a regular file\nto a path where a directory currently sits, and the other is about\nchecking out a regular file that requires a parent directory at a\npath where a regular file currently occupies. These days, I suspect\nthat we would make these into a single \"d/f conflict when checking\nfiles out\" test script, and f50c9f76 might have been a good chance\nto do such a clean-up. If somebody cares deeply enough, I do not\nmind seeing a belated clean-up, either.\n\n> t7500-commit.sh\n> t7501-commit.sh\n> t7502-commit.sh\n> t7509-commit.sh\n\nThese seem to have organically grown and it is very likely that ones\nlater introduced were added more from laziness.\n\nIf somebody wants to clean them up, probably the first thing to do\nis to study them to come up with a clear $test_description for each\nof them. I think t7509 says --reset-author and it may have started\nas a test on that single feature, but it now covers other ways to\nset and/or preserve authorship information, so it may make sense to\nupdate its $test_description to \"commit authorship\" or something,\nfor example.\n\n"},{"id":"357313","messageId":"2293750.yp9BkL5mAn@thunderbird","threadId":"49269","inReplyTo":"CACsJy8B1UDN26tWPvOtixSBiFF6bYP2BtK2n1u4W-tWdVeKK1A@mail.gmail.com","subject":"Re: test files with same names?","fromName":"Stephen & Linda Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-09-04T18:04:14Z","receivedAt":"2018-09-04T18:04:17Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"I don't mind doing this.\n\nOn Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote:\n> Duy Nguyen writes:\n> > t2000-checkout-cache-clash.sh\n> > t2001-checkout-cache-clash.sh\n> \n> These date back to 368f99d5 (\"[PATCH 2/2] The core GIT tests: recent\n> additions and fixes.\", 2005-05-13) which later were renamed by\n> f50c9f76 (\"Rename some test scripts and describe the naming\n> convention\", 2005-05-15). One was about checking out a regular file\n> to a path where a directory currently sits, and the other is about\n> checking out a regular file that requires a parent directory at a\n> path where a regular file currently occupies. These days, I suspect\n> that we would make these into a single \"d/f conflict when checking\n> files out\" test script, and f50c9f76 might have been a good chance\n> to do such a clean-up. If somebody cares deeply enough, I do not\n> mind seeing a belated clean-up, either.\n> \n> > t7500-commit.sh\n> > t7501-commit.sh\n> > t7502-commit.sh\n> > t7509-commit.sh\n> \n> These seem to have organically grown and it is very likely that ones\n> later introduced were added more from laziness.\n> \n> If somebody wants to clean them up, probably the first thing to do\n> is to study them to come up with a clear $test_description for each\n> of them. I think t7509 says --reset-author and it may have started\n> as a test on that single feature, but it now covers other ways to\n> set and/or preserve authorship information, so it may make sense to\n> update its $test_description to \"commit authorship\" or something,\n> for example.\n\n\n\n\n"},{"id":"357452","messageId":"32028230.38oFsPliiV@thunderbird","threadId":"49269","inReplyTo":"2293750.yp9BkL5mAn@thunderbird","subject":"How to handle patch series conflicts","fromName":"Stephen & Linda Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-09-05T17:25:17Z","receivedAt":"2018-09-05T17:25:20Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"Junio -\n\nOn Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote:\n> > t7500-commit.sh\n> > t7501-commit.sh\n> > t7502-commit.sh\n> > t7509-commit.sh\n> \n> These seem to have organically grown and it is very likely that ones\n> later introduced were added more from laziness.\n\nHow does the project prefer to handle patches that conflict. Renaming t7501-\ncommit.sh will conflict with a patch set that I submitted over the weekend \n[1]. Should I treat them as totally separate? \n\nOn Tuesday, September 4, 2018 3:36:11 PM MST Junio C Hamano wrote:\n> * sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits\n> . commit: fix exit code when doing a dry run\n> . wt-status: teach wt_status_collect about merges in progress\n> . wt-status: rename commitable to committable\n> . t7501: add coverage for flags which imply dry runs\n\nI noted that this patch set is similar to the one that I just submitted. Are \nyou thinking of not using mine (in which case I will drop it)? If not I will \nadd a patch to fix the committable spelling[2] and re-roll.\n\n[1] https://public-inbox.org/git/20180901235256.4260-1-ischis2@cox.net/\n\n\n\n"},{"id":"357456","messageId":"CAGZ79kb5MnUyX9BkFDyFQ7HQ4nXGeo66OUHMPaumfeHgM7e46w@mail.gmail.com","threadId":"49269","inReplyTo":"32028230.38oFsPliiV@thunderbird","subject":"Re: How to handle patch series conflicts","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-09-05T17:27:26Z","receivedAt":"2018-09-05T17:27:40Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Wed, Sep 5, 2018 at 10:25 AM Stephen & Linda Smith wrote:\n>\n> Junio -\n>\n> On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote:\n> > > t7500-commit.sh\n> > > t7501-commit.sh\n> > > t7502-commit.sh\n> > > t7509-commit.sh\n> >\n> > These seem to have organically grown and it is very likely that ones\n> > later introduced were added more from laziness.\n>\n> How does the project prefer to handle patches that conflict. Renaming t7501-\n> commit.sh will conflict with a patch set that I submitted over the weekend\n> [1]. Should I treat them as totally separate?\n\nWhen doing a rename, this should merge fine without much complication,\nso I'd think it is fine to treat them separately. That way they can be merged\nto next/master independently.\n"},{"id":"357481","messageId":"xmqq1sa74pd5.fsf@gitster-ct.c.googlers.com","threadId":"49269","inReplyTo":"32028230.38oFsPliiV@thunderbird","subject":"Re: How to handle patch series conflicts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-09-05T21:16:06Z","receivedAt":"2018-09-05T21:16:11Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stephen & Linda Smith writes:\n\n> Junio -\n>\n> On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote:\n>> > t7500-commit.sh\n>> > t7501-commit.sh\n>> > t7502-commit.sh\n>> > t7509-commit.sh\n>> \n>> These seem to have organically grown and it is very likely that ones\n>> later introduced were added more from laziness.\n>\n> How does the project prefer to handle patches that conflict. Renaming t7501-\n> commit.sh will conflict with a patch set that I submitted over the weekend \n> [1]. Should I treat them as totally separate? \n\nHow about not doing the rename before the more important changes\nsolidify? Alternatively, doing the rename as a preparatory clean-up\nand building the more important changes on top is also possible.\n\n> On Tuesday, September 4, 2018 3:36:11 PM MST Junio C Hamano wrote:\n>> * sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits\n>> . commit: fix exit code when doing a dry run\n>> . wt-status: teach wt_status_collect about merges in progress\n>> . wt-status: rename commitable to committable\n>> . t7501: add coverage for flags which imply dry runs\n>\n> I noted that this patch set is similar to the one that I just submitted. Are \n> you thinking of not using mine (in which case I will drop it)? If not I will \n> add a patch to fix the committable spelling[2] and re-roll.\n\nI think that one that is not even in 'pu' hasn't been looked at for\na long time; it is probably a good idea to discard and replace, if\nyou have something working.\n"},{"id":"357483","messageId":"5803595.xkvfBUJ20C@thunderbird","threadId":"49269","inReplyTo":"32028230.38oFsPliiV@thunderbird","subject":"Re: How to handle patch series conflicts","fromName":"Stephen & Linda Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-09-05T21:34:01Z","receivedAt":"2018-09-05T21:34:04Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote:\n> I think that one that is not even in 'pu' hasn't been looked at for\n> a long time; it is probably a good idea to discard and replace, if\n> you have something working.\n\nI submitted [1] over the weekend. I will add a spelling error patch and then \nsubmit version 3 hopefully before the end of the day. I am working on the \ntest rename, but will wait to submit until after the wt-status.c patches cook \nand then go to mainline. Rationale: I haven't yet gone through the commit \nscripts to decided on the best proposed names.\n\n[1] https://public-inbox.org/git/20180901235256.4260-1-ischis2@cox.net/\n\n\n\n\n"},{"id":"357487","messageId":"6537729.UHPOpRP2X2@thunderbird","threadId":"49269","inReplyTo":"32028230.38oFsPliiV@thunderbird","subject":"Re: How to handle patch series conflicts","fromName":"Stephen & Linda Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-09-05T22:03:46Z","receivedAt":"2018-09-05T22:03:52Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote:\n> I think that one that is not even in 'pu' hasn't been looked at for\n> a long time; it is probably a good idea to discard and replace, if\n> you have something working.\n\nI submitted [1] over the weekend. I will add a spelling error patch and then \nsubmit version 3 hopefully before the end of the day. I am working on the \ntest rename, but will wait to submit until after the wt-status.c patches cook \nand then go to mainline. Rationale: I haven't yet gone through the commit \nscripts to decided on the best proposed names.\n\n[1] https://public-inbox.org/git/20180901235256.4260-1-ischis2@cox.net/\n\n\n\n\n\n\n\n"},{"id":"357594","messageId":"1749364.tUMQzLrKjK@thunderbird","threadId":"49269","inReplyTo":"32028230.38oFsPliiV@thunderbird","subject":"Re: How to handle patch series conflicts","fromName":"Stephen Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-09-07T00:12:08Z","receivedAt":"2018-09-07T00:12:11Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote:\n> I think that one that is not even in 'pu' hasn't been looked at for\n> a long time; it is probably a good idea to discard and replace, if\n> you have something working.\n\nI submitted a working patch set yesterday. \n\n[1] https://public-inbox.org/git/20180906005329.11277-1-ischis2@cox.net/T/\n#m3ed5a15721318f71064dbe7225be9242c3960e1c\n\nsps\n\n\n"},{"id":"359816","messageId":"2206767.tHxkKBSiVS@thunderbird","threadId":"49269","inReplyTo":"xmqq1sa74pd5.fsf@gitster-ct.c.googlers.com","subject":"Re: How to handle patch series conflicts","fromName":"Stephen & Linda Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-10-08T01:28:38Z","receivedAt":"2018-10-08T01:28:42Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"On Wednesday, September 5, 2018 2:16:06 PM MST Junio C Hamano wrote:\n> Stephen & Linda Smith writes:\n> > Junio -\n> > \n> > On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote:\n> >> > t7500-commit.sh\n> >> > t7501-commit.sh\n> >> > t7502-commit.sh\n> >> > t7509-commit.sh\n> >> \n> >> These seem to have organically grown and it is very likely that ones\n> >> later introduced were added more from laziness.\n\nJunio - I've been working this but would like your opinion on 7500, 7501 and \nnow 7510. \n\nI note that the the commit tests have intermixed functionality. An example is \nsignoff tests that are in the three tests I mentioned. \n\nI've been tempted multiple times over the last week to just merge the tests \ninto a single script, but that doesn't seem right either.\n\nSo would you prefer a single script? Would you prefer me to move tests \naround?\n\nsps\n\n\n"},{"id":"359901","messageId":"xmqqh8hvr7le.fsf@gitster-ct.c.googlers.com","threadId":"49269","inReplyTo":"2206767.tHxkKBSiVS@thunderbird","subject":"Re: How to handle patch series conflicts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-10-09T05:51:09Z","receivedAt":"2018-10-09T05:51:14Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stephen & Linda Smith writes:\n\n> Junio - I've been working this but would like your opinion on 7500, 7501 and \n> now 7510. \n>\n> I note that the the commit tests have intermixed functionality. An example is \n> signoff tests that are in the three tests I mentioned. \n>\n> I've been tempted multiple times over the last week to just merge the tests \n> into a single script, but that doesn't seem right either.\n>\n> So would you prefer a single script? Would you prefer me to move tests \n> around?\n\nThe scripts themselves having the same name that is no more specific\ntha just \"commit\" does not bother _me_ personally too much. If I\nwere doing it, unless you are an obsessive type that wants to see\nspanking cleanness everywhere, I'd limit the changes to the minimum.\n\nIf something tested in script X is tested in another script Y and it\nis trivial to see they are testing exactly the same thing, removing\none copy from script Y would be good, and if the remaining changes\nin script Y becomes more focused with only such removals, that would\neven be better, as at that point we can rename \"tY-commit.sh\" to\nsomething more specific like \"tY-commit-signature.sh\".\n"},{"id":"359920","messageId":"3649573.ScJ4RYJQ9R@thunderbird","threadId":"49269","inReplyTo":"2206767.tHxkKBSiVS@thunderbird","subject":"Re: How to handle patch series conflicts","fromName":"Stephen Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-10-09T13:11:57Z","receivedAt":"2018-10-09T13:12:00Z","isPatch":false,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"On Monday, October 8, 2018 10:51:09 PM MST Junio C Hamano wrote:\n\n> The scripts themselves having the same name that is no more specific\n> tha just \"commit\" does not bother _me_ personally too much. If I\n> were doing it, unless you are an obsessive type that wants to see\n> spanking cleanness everywhere, I'd limit the changes to the minimum.\n> \nNo I'm not an obsessive type.\n\nsps\n\n\n"},{"id":"361246","messageId":"20181023035341.15398-1-ischis2@cox.net","threadId":"49269","inReplyTo":"xmqqwos19nr5.fsf@gitster-ct.c.googlers.com","subject":"[PATCH 0/5] Commit test name clean-up","fromName":"Stephen P. Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-10-23T03:53:36Z","receivedAt":"2018-10-23T03:53:44Z","isPatch":true,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"Several tests did not comply with the documented test naming standard.\n\nThe patch series was held off until updates to t7501 was merged to the\nmaster branch.\n\nStephen P. Smith (5):\n t2000: rename and combine checkout clash tests\n t7509: cleanup description and filename\n t7502: rename commit test script to comply with naming convention\n t7500: rename commit tests script to comply with naming convention\n t7501: rename commit test to comply with naming convention\n\n t/t2000-checkout-cache-clash.sh | 60 --------\n t/t2000-conflict-when-checking-files-out.sh | 135 ++++++++++++++++++\n t/t2001-checkout-cache-clash.sh | 85 -----------\n ...> t7500-commit-template-squash-signoff.sh} | 2 +-\n ....sh => t7501-commit-basic-funtionality.sh} | 0\n ...02-commit.sh => t7502-commit-porcelain.sh} | 0\n ...9-commit.sh => t7509-commit-authorship.sh} | 2 +-\n 7 files changed, 137 insertions(+), 147 deletions(-)\n delete mode 100755 t/t2000-checkout-cache-clash.sh\n create mode 100755 t/t2000-conflict-when-checking-files-out.sh\n delete mode 100755 t/t2001-checkout-cache-clash.sh\n rename t/{t7500-commit.sh => t7500-commit-template-squash-signoff.sh} (99%)\n rename t/{t7501-commit.sh => t7501-commit-basic-funtionality.sh} (100%)\n rename t/{t7502-commit.sh => t7502-commit-porcelain.sh} (100%)\n rename t/{t7509-commit.sh => t7509-commit-authorship.sh} (98%)\n\n-- \n2.19.0\n\n"},{"id":"361247","messageId":"20181023035341.15398-3-ischis2@cox.net","threadId":"49269","inReplyTo":"xmqqwos19nr5.fsf@gitster-ct.c.googlers.com","subject":"[PATCH 2/5] t7509: cleanup description and filename","fromName":"Stephen P. Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-10-23T03:53:38Z","receivedAt":"2018-10-23T03:53:45Z","isPatch":true,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"Rename test and update the test description to explicitly state that\nincluded tests all relate to commit authorship. The t7509-commit.sh\nfile was not rnemamed when other scripts were updated in compliance\nwith the test naming convention.\n\n[1] f50c9f76c (\"Rename some test scripts and describe the naming convention\", 2005-05-15)\n\nSigned-off-by: Stephen P. Smith \n---\n t/{t7509-commit.sh => t7509-commit-authorship.sh} | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n rename t/{t7509-commit.sh => t7509-commit-authorship.sh} (98%)\n\ndiff --git a/t/t7509-commit.sh b/t/t7509-commit-authorship.sh\nsimilarity index 98%\nrename from t/t7509-commit.sh\nrename to t/t7509-commit-authorship.sh\nindex ddef7ea6b0..500ab2fe72 100755\n--- a/t/t7509-commit.sh\n+++ b/t/t7509-commit-authorship.sh\n@@ -3,7 +3,7 @@\n # Copyright (c) 2009 Erick Mattos\n #\n \n-test_description='git commit --reset-author'\n+test_description='commit tests of various authorhip options. '\n \n . ./test-lib.sh\n \n-- \n2.19.0\n\n"},{"id":"361248","messageId":"20181023035341.15398-2-ischis2@cox.net","threadId":"49269","inReplyTo":"xmqqwos19nr5.fsf@gitster-ct.c.googlers.com","subject":"[PATCH 1/5] t2000: rename and combine checkout clash tests","fromName":"Stephen P. Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-10-23T03:53:37Z","receivedAt":"2018-10-23T03:53:45Z","isPatch":true,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"In an earlier patch some tests scripts were renamed and a naming\nconvention was documented. [1]\n\nMerge t2000-checkout-cache-clash.sh and t2001-checkout-cache-clash.sh into\nt2000-conflict-when-checking-files-out.sh.\n\n[1] f50c9f76c (\"Rename some test scripts and describe the naming convention\", 2005-05-15)\n\nSigned-off-by: Stephen P. Smith \n---\n t/t2000-checkout-cache-clash.sh | 60 ---------\n t/t2000-conflict-when-checking-files-out.sh | 135 ++++++++++++++++++++\n t/t2001-checkout-cache-clash.sh | 85 ------------\n 3 files changed, 135 insertions(+), 145 deletions(-)\n delete mode 100755 t/t2000-checkout-cache-clash.sh\n create mode 100755 t/t2000-conflict-when-checking-files-out.sh\n delete mode 100755 t/t2001-checkout-cache-clash.sh\n\ndiff --git a/t/t2000-checkout-cache-clash.sh b/t/t2000-checkout-cache-clash.sh\ndeleted file mode 100755\nindex de3edb5d57..0000000000\n--- a/t/t2000-checkout-cache-clash.sh\n+++ /dev/null\n@@ -1,60 +0,0 @@\n-#!/bin/sh\n-#\n-# Copyright (c) 2005 Junio C Hamano\n-#\n-\n-test_description='git checkout-index test.\n-\n-This test registers the following filesystem structure in the\n-cache:\n-\n- path0 - a file\n- path1/file1 - a file in a directory\n-\n-And then tries to checkout in a work tree that has the following:\n-\n- path0/file0 - a file in a directory\n- path1 - a file\n-\n-The git checkout-index command should fail when attempting to checkout\n-path0, finding it is occupied by a directory, and path1/file1, finding\n-path1 is occupied by a non-directory. With \"-f\" flag, it should remove\n-the conflicting paths and succeed.\n-'\n-. ./test-lib.sh\n-\n-date >path0\n-mkdir path1\n-date >path1/file1\n-\n-test_expect_success \\\n- 'git update-index --add various paths.' \\\n- 'git update-index --add path0 path1/file1'\n-\n-rm -fr path0 path1\n-mkdir path0\n-date >path0/file0\n-date >path1\n-\n-test_expect_success \\\n- 'git checkout-index without -f should fail on conflicting work tree.' \\\n- 'test_must_fail git checkout-index -a'\n-\n-test_expect_success \\\n- 'git checkout-index with -f should succeed.' \\\n- 'git checkout-index -f -a'\n-\n-test_expect_success \\\n- 'git checkout-index conflicting paths.' \\\n- 'test -f path0 && test -d path1 && test -f path1/file1'\n-\n-test_expect_success SYMLINKS 'checkout-index -f twice with --prefix' '\n-\tmkdir -p tar/get &&\n-\tln -s tar/get there &&\n-\techo first &&\n-\tgit checkout-index -a -f --prefix=there/ &&\n-\techo second &&\n-\tgit checkout-index -a -f --prefix=there/\n-'\n-\n-test_done\ndiff --git a/t/t2000-conflict-when-checking-files-out.sh b/t/t2000-conflict-when-checking-files-out.sh\nnew file mode 100755\nindex 0000000000..f18616ad2b\n--- /dev/null\n+++ b/t/t2000-conflict-when-checking-files-out.sh\n@@ -0,0 +1,135 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2005 Junio C Hamano\n+#\n+\n+test_description='git conflicts when checking files out test.'\n+\n+# The first test registers the following filesystem structure in the\n+# cache:\n+#\n+# path0 - a file\n+# path1/file1 - a file in a directory\n+#\n+# And then tries to checkout in a work tree that has the following:\n+#\n+# path0/file0 - a file in a directory\n+# path1 - a file\n+#\n+# The git checkout-index command should fail when attempting to checkout\n+# path0, finding it is occupied by a directory, and path1/file1, finding\n+# path1 is occupied by a non-directory. With \"-f\" flag, it should remove\n+# the conflicting paths and succeed.\n+\n+. ./test-lib.sh\n+\n+show_files() {\n+\t# show filesystem files, just [-dl] for type and name\n+\tfind path? -ls |\n+\tsed -e 's/^[0-9]* * [0-9]* * \\([-bcdl]\\)[^ ]* *[0-9]* *[^ ]* *[^ ]* *[0-9]* [A-Z][a-z][a-z] [0-9][0-9] [^ ]* /fs: \\1 /'\n+\t# what's in the cache, just mode and name\n+\tgit ls-files --stage |\n+\tsed -e 's/^\\([0-9]*\\) [0-9a-f]* [0-3] /ca: \\1 /'\n+\t# what's in the tree, just mode and name.\n+\tgit ls-tree -r \"$1\" |\n+\tsed -e 's/^\\([0-9]*\\)\t[^ ]*\t[0-9a-f]*\t/tr: \\1 /'\n+}\n+\n+date >path0\n+mkdir path1\n+date >path1/file1\n+\n+test_expect_success \\\n+ 'git update-index --add various paths.' \\\n+ 'git update-index --add path0 path1/file1'\n+\n+rm -fr path0 path1\n+mkdir path0\n+date >path0/file0\n+date >path1\n+\n+test_expect_success \\\n+ 'git checkout-index without -f should fail on conflicting work tree.' \\\n+ 'test_must_fail git checkout-index -a'\n+\n+test_expect_success \\\n+ 'git checkout-index with -f should succeed.' \\\n+ 'git checkout-index -f -a'\n+\n+test_expect_success \\\n+ 'git checkout-index conflicting paths.' \\\n+ 'test -f path0 && test -d path1 && test -f path1/file1'\n+\n+test_expect_success SYMLINKS 'checkout-index -f twice with --prefix' '\n+\tmkdir -p tar/get &&\n+\tln -s tar/get there &&\n+\techo first &&\n+\tgit checkout-index -a -f --prefix=there/ &&\n+\techo second &&\n+\tgit checkout-index -a -f --prefix=there/\n+'\n+\n+# The second test registers the following filesystem structure in the cache:\n+#\n+# path2/file0\t- a file in a directory\n+# path3/file1 - a file in a directory\n+#\n+# and attempts to check it out when the work tree has:\n+#\n+# path2/file0 - a file in a directory\n+# path3 - a symlink pointing at \"path2\"\n+#\n+# Checkout cache should fail to extract path3/file1 because the leading\n+# path path3 is occupied by a non-directory. With \"-f\" it should remove\n+# the symlink path3 and create directory path3 and file path3/file1.\n+\n+mkdir path2\n+date >path2/file0\n+test_expect_success \\\n+ 'git update-index --add path2/file0' \\\n+ 'git update-index --add path2/file0'\n+test_expect_success \\\n+ 'writing tree out with git write-tree' \\\n+ 'tree1=$(git write-tree)'\n+test_debug 'show_files $tree1'\n+\n+mkdir path3\n+date >path3/file1\n+test_expect_success \\\n+ 'git update-index --add path3/file1' \\\n+ 'git update-index --add path3/file1'\n+test_expect_success \\\n+ 'writing tree out with git write-tree' \\\n+ 'tree2=$(git write-tree)'\n+test_debug 'show_files $tree2'\n+\n+rm -fr path3\n+test_expect_success \\\n+ 'read previously written tree and checkout.' \\\n+ 'git read-tree -m $tree1 && git checkout-index -f -a'\n+test_debug 'show_files $tree1'\n+\n+test_expect_success \\\n+ 'add a symlink' \\\n+ 'test_ln_s_add path2 path3'\n+test_expect_success \\\n+ 'writing tree out with git write-tree' \\\n+ 'tree3=$(git write-tree)'\n+test_debug 'show_files $tree3'\n+\n+# Morten says \"Got that?\" here.\n+# Test begins.\n+\n+test_expect_success \\\n+ 'read previously written tree and checkout.' \\\n+ 'git read-tree $tree2 && git checkout-index -f -a'\n+test_debug 'show_files $tree2'\n+\n+test_expect_success \\\n+ 'checking out conflicting path with -f' \\\n+ 'test ! -h path2 && test -d path2 &&\n+ test ! -h path3 && test -d path3 &&\n+ test ! -h path2/file0 && test -f path2/file0 &&\n+ test ! -h path3/file1 && test -f path3/file1'\n+\n+test_done\ndiff --git a/t/t2001-checkout-cache-clash.sh b/t/t2001-checkout-cache-clash.sh\ndeleted file mode 100755\nindex 1fc8e634b7..0000000000\n--- a/t/t2001-checkout-cache-clash.sh\n+++ /dev/null\n@@ -1,85 +0,0 @@\n-#!/bin/sh\n-#\n-# Copyright (c) 2005 Junio C Hamano\n-#\n-\n-test_description='git checkout-index test.\n-\n-This test registers the following filesystem structure in the cache:\n-\n- path0/file0\t- a file in a directory\n- path1/file1 - a file in a directory\n-\n-and attempts to check it out when the work tree has:\n-\n- path0/file0 - a file in a directory\n- path1 - a symlink pointing at \"path0\"\n-\n-Checkout cache should fail to extract path1/file1 because the leading\n-path path1 is occupied by a non-directory. With \"-f\" it should remove\n-the symlink path1 and create directory path1 and file path1/file1.\n-'\n-. ./test-lib.sh\n-\n-show_files() {\n-\t# show filesystem files, just [-dl] for type and name\n-\tfind path? -ls |\n-\tsed -e 's/^[0-9]* * [0-9]* * \\([-bcdl]\\)[^ ]* *[0-9]* *[^ ]* *[^ ]* *[0-9]* [A-Z][a-z][a-z] [0-9][0-9] [^ ]* /fs: \\1 /'\n-\t# what's in the cache, just mode and name\n-\tgit ls-files --stage |\n-\tsed -e 's/^\\([0-9]*\\) [0-9a-f]* [0-3] /ca: \\1 /'\n-\t# what's in the tree, just mode and name.\n-\tgit ls-tree -r \"$1\" |\n-\tsed -e 's/^\\([0-9]*\\)\t[^ ]*\t[0-9a-f]*\t/tr: \\1 /'\n-}\n-\n-mkdir path0\n-date >path0/file0\n-test_expect_success \\\n- 'git update-index --add path0/file0' \\\n- 'git update-index --add path0/file0'\n-test_expect_success \\\n- 'writing tree out with git write-tree' \\\n- 'tree1=$(git write-tree)'\n-test_debug 'show_files $tree1'\n-\n-mkdir path1\n-date >path1/file1\n-test_expect_success \\\n- 'git update-index --add path1/file1' \\\n- 'git update-index --add path1/file1'\n-test_expect_success \\\n- 'writing tree out with git write-tree' \\\n- 'tree2=$(git write-tree)'\n-test_debug 'show_files $tree2'\n-\n-rm -fr path1\n-test_expect_success \\\n- 'read previously written tree and checkout.' \\\n- 'git read-tree -m $tree1 && git checkout-index -f -a'\n-test_debug 'show_files $tree1'\n-\n-test_expect_success \\\n- 'add a symlink' \\\n- 'test_ln_s_add path0 path1'\n-test_expect_success \\\n- 'writing tree out with git write-tree' \\\n- 'tree3=$(git write-tree)'\n-test_debug 'show_files $tree3'\n-\n-# Morten says \"Got that?\" here.\n-# Test begins.\n-\n-test_expect_success \\\n- 'read previously written tree and checkout.' \\\n- 'git read-tree $tree2 && git checkout-index -f -a'\n-test_debug 'show_files $tree2'\n-\n-test_expect_success \\\n- 'checking out conflicting path with -f' \\\n- 'test ! -h path0 && test -d path0 &&\n- test ! -h path1 && test -d path1 &&\n- test ! -h path0/file0 && test -f path0/file0 &&\n- test ! -h path1/file1 && test -f path1/file1'\n-\n-test_done\n-- \n2.19.0\n\n"},{"id":"361249","messageId":"20181023035341.15398-5-ischis2@cox.net","threadId":"49269","inReplyTo":"xmqqwos19nr5.fsf@gitster-ct.c.googlers.com","subject":"[PATCH 4/5] t7500: rename commit tests script to comply with naming convention","fromName":"Stephen P. Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-10-23T03:53:40Z","receivedAt":"2018-10-23T03:53:45Z","isPatch":true,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"When the test naming convention was documented[1] the commit script\nwas not renamed.\n\nUpdate the test description to note that the tests fall into for\ngeneral categories: template, sign-off, -F and squash tests.\n\nChose to not add \"File\" to the new script name as that did not seem to\nconvey the current test contents for that switch.\n\n[1] f50c9f76c (\"Rename some test scripts and describe the naming convention\", 2005-05-15)\n\nSigned-off-by: Stephen P. Smith \n---\n t/{t7500-commit.sh => t7500-commit-template-squash-signoff.sh} | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n rename t/{t7500-commit.sh => t7500-commit-template-squash-signoff.sh} (99%)\n\ndiff --git a/t/t7500-commit.sh b/t/t7500-commit-template-squash-signoff.sh\nsimilarity index 99%\nrename from t/t7500-commit.sh\nrename to t/t7500-commit-template-squash-signoff.sh\nindex 31ab608b67..46a5cd4b73 100755\n--- a/t/t7500-commit.sh\n+++ b/t/t7500-commit-template-squash-signoff.sh\n@@ -5,7 +5,7 @@\n \n test_description='git commit\n \n-Tests for selected commit options.'\n+Tests for template, signoff, squash and -F functions.'\n \n . ./test-lib.sh\n \n-- \n2.19.0\n\n"},{"id":"361250","messageId":"20181023035341.15398-4-ischis2@cox.net","threadId":"49269","inReplyTo":"xmqqwos19nr5.fsf@gitster-ct.c.googlers.com","subject":"[PATCH 3/5] t7502: rename commit test script to comply with naming convention","fromName":"Stephen P. Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-10-23T03:53:39Z","receivedAt":"2018-10-23T03:53:46Z","isPatch":true,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"When the test naming convention was documented[1] the commit script\nwas not renamed.\n\nThe test description for t7502 indicates that the test file is to\ncontain porcelain type options for the commit command.\n\nThe tests don't fall into a single category. There are tests for\ncleanup, sign-off, multiple message options, etc.\n\nRename the t7502-commit.sh to t7502-commit-porcelain.sh which reflects\nthe high level nature and usage of the options to commit.\n\n[1] f50c9f76c (\"Rename some test scripts and describe the naming convention\", 2005-05-15)\n\nSigned-off-by: Stephen P. Smith \n---\n t/{t7502-commit.sh => t7502-commit-porcelain.sh} | 0\n 1 file changed, 0 insertions(+), 0 deletions(-)\n rename t/{t7502-commit.sh => t7502-commit-porcelain.sh} (100%)\n\ndiff --git a/t/t7502-commit.sh b/t/t7502-commit-porcelain.sh\nsimilarity index 100%\nrename from t/t7502-commit.sh\nrename to t/t7502-commit-porcelain.sh\n-- \n2.19.0\n\n"},{"id":"361251","messageId":"20181023035341.15398-6-ischis2@cox.net","threadId":"49269","inReplyTo":"xmqqwos19nr5.fsf@gitster-ct.c.googlers.com","subject":"[PATCH 5/5] t7501: rename commit test to comply with naming convention","fromName":"Stephen P. Smith","fromEmail":"ischis2@cox.net","sentAt":"2018-10-23T03:53:41Z","receivedAt":"2018-10-23T03:53:49Z","isPatch":true,"sender":{"key":"ishchis2@gmail.com","avatar":null},"body":"The naming convention was documented [1] but this script was not\nrenamed.\n\nThe original commit message indicates the script tests basic commit\nfunctionality. Clean up the test name by changing the file name to\nspecify the intent as documented in the initial commit.\n\n[1] f50c9f76c (\"Rename some test scripts and describe the naming convention\", 2005-05-15)\n\nSigned-off-by: Stephen P. Smith \n---\n t/{t7501-commit.sh => t7501-commit-basic-funtionality.sh} | 0\n 1 file changed, 0 insertions(+), 0 deletions(-)\n rename t/{t7501-commit.sh => t7501-commit-basic-funtionality.sh} (100%)\n\ndiff --git a/t/t7501-commit.sh b/t/t7501-commit-basic-funtionality.sh\nsimilarity index 100%\nrename from t/t7501-commit.sh\nrename to t/t7501-commit-basic-funtionality.sh\n-- \n2.19.0\n\n"},{"id":"361252","messageId":"CAPig+cThnimYhojPQ37U8tb2EyRa-izMe-4PAvzE5MmTms6ixw@mail.gmail.com","threadId":"49269","inReplyTo":"20181023035341.15398-3-ischis2@cox.net","subject":"Re: [PATCH 2/5] t7509: cleanup description and filename","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2018-10-23T04:03:00Z","receivedAt":"2018-10-23T04:03:15Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Mon, Oct 22, 2018 at 11:53 PM Stephen P. Smith wrote:>\n> Rename test and update the test description to explicitly state that\n> included tests all relate to commit authorship. The t7509-commit.sh\n> file was not rnemamed when other scripts were updated in compliance\n\ns/rnemamed/renamed/\n\n> with the test naming convention.\n>\n> Signed-off-by: Stephen P. Smith \n"},{"id":"361253","messageId":"CAPig+cQpz1c9D4-Swqaor1ddDB54wDaAjudKpz+MtRnChsyVdQ@mail.gmail.com","threadId":"49269","inReplyTo":"20181023035341.15398-5-ischis2@cox.net","subject":"Re: [PATCH 4/5] t7500: rename commit tests script to comply with naming convention","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2018-10-23T04:05:09Z","receivedAt":"2018-10-23T04:05:23Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Mon, Oct 22, 2018 at 11:53 PM Stephen P. Smith wrote:\n> When the test naming convention was documented[1] the commit script\n> was not renamed.\n>\n> Update the test description to note that the tests fall into for\n> general categories: template, sign-off, -F and squash tests.\n\ns/for/four/\n\n> Chose to not add \"File\" to the new script name as that did not seem to\n> convey the current test contents for that switch.\n>\n> Signed-off-by: Stephen P. Smith \n"},{"id":"361254","messageId":"CAPig+cTLxkixXizKuPb8iGxOfb0Mx8CHSkcwiK=VxxHW7iLKBw@mail.gmail.com","threadId":"49269","inReplyTo":"20181023035341.15398-6-ischis2@cox.net","subject":"Re: [PATCH 5/5] t7501: rename commit test to comply with naming convention","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2018-10-23T04:07:01Z","receivedAt":"2018-10-23T04:07:15Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Mon, Oct 22, 2018 at 11:54 PM Stephen P. Smith wrote:\n> The naming convention was documented [1] but this script was not\n> renamed.\n>\n> The original commit message indicates the script tests basic commit\n> functionality. Clean up the test name by changing the file name to\n> specify the intent as documented in the initial commit.\n>\n> Signed-off-by: Stephen P. Smith \n> ---\n> diff --git a/t/t7501-commit.sh b/t/t7501-commit-basic-funtionality.sh\n> rename from t/t7501-commit.sh\n> rename to t/t7501-commit-basic-funtionality.sh\n\ns/funtionality/functionality/\n"}]}