{"thread":{"id":"15459","subject":"[PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","startedAt":"2008-09-09T21:25:29Z","lastAt":"2008-10-28T15:57:52Z","messageCount":8,"participants":["Nanako Shiraishi","Junio C Hamano","Jeff King","Dmitry V. Levin"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"90267","messageId":"20080910062529.6117@nanako3.lavabit.com","threadId":"15459","inReplyTo":null,"subject":"[PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-09-09T21:25:29Z","receivedAt":"2008-09-09T21:25:29Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"The environment variable CVS_SERVER is still set to \"git-cvsserver\",\nbecause tests fail with CVS_SERVER='git cvsserver' (or double quotes).\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n t/t9400-git-cvsserver-server.sh |   38 +++++++++++++++++++-------------------\n t/t9401-git-cvsserver-crlf.sh   |    8 ++++----\n 2 files changed, 23 insertions(+), 23 deletions(-)\n\ndiff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh\nindex c1850d2..1ef0a06 100755\n--- a/t/t9400-git-cvsserver-server.sh\n+++ b/t/t9400-git-cvsserver-server.sh\n@@ -3,22 +3,22 @@\n # Copyright (c) 2007 Frank Lichtenheld\n #\n \n-test_description='git-cvsserver access\n+test_description='git cvsserver access\n \n tests read access to a git repository with the\n-cvs CLI client via git-cvsserver server'\n+cvs CLI client via git cvsserver server'\n \n . ./test-lib.sh\n \n cvs >/dev/null 2>&1\n if test $? -ne 1\n then\n-    test_expect_success 'skipping git-cvsserver tests, cvs not found' :\n+    test_expect_success 'skipping git cvsserver tests, cvs not found' :\n     test_done\n     exit\n fi\n perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {\n-    test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :\n+    test_expect_success 'skipping git cvsserver tests, Perl SQLite interface unavailable' :\n     test_done\n     exit\n }\n@@ -93,11 +93,11 @@ END VERIFICATION REQUEST\n EOF\n \n test_expect_success 'pserver authentication' \\\n-  'cat request-anonymous | git-cvsserver pserver >log 2>&1 &&\n+  'cat request-anonymous | git cvsserver pserver >log 2>&1 &&\n    sed -ne \\$p log | grep \"^I LOVE YOU$\"'\n \n test_expect_success 'pserver authentication failure (non-anonymous user)' \\\n-  'if cat request-git | git-cvsserver pserver >log 2>&1\n+  'if cat request-git | git cvsserver pserver >log 2>&1\n    then\n        false\n    else\n@@ -106,11 +106,11 @@ test_expect_success 'pserver authentication failure (non-anonymous user)' \\\n    sed -ne \\$p log | grep \"^I HATE YOU$\"'\n \n test_expect_success 'pserver authentication (login)' \\\n-  'cat login-anonymous | git-cvsserver pserver >log 2>&1 &&\n+  'cat login-anonymous | git cvsserver pserver >log 2>&1 &&\n    sed -ne \\$p log | grep \"^I LOVE YOU$\"'\n \n test_expect_success 'pserver authentication failure (login/non-anonymous user)' \\\n-  'if cat login-git | git-cvsserver pserver >log 2>&1\n+  'if cat login-git | git cvsserver pserver >log 2>&1\n    then\n        false\n    else\n@@ -139,7 +139,7 @@ Root $WORKDIR\n EOF\n \n test_expect_success 'req_Root failure (relative pathname)' \\\n-  'if cat request-relative | git-cvsserver pserver >log 2>&1\n+  'if cat request-relative | git cvsserver pserver >log 2>&1\n    then\n        echo unexpected success\n        false\n@@ -149,25 +149,25 @@ test_expect_success 'req_Root failure (relative pathname)' \\\n    tail log | grep \"^error 1 Root must be an absolute pathname$\"'\n \n test_expect_success 'req_Root failure (conflicting roots)' \\\n-  'cat request-conflict | git-cvsserver pserver >log 2>&1 &&\n+  'cat request-conflict | git cvsserver pserver >log 2>&1 &&\n    tail log | grep \"^error 1 Conflicting roots specified$\"'\n \n test_expect_success 'req_Root (strict paths)' \\\n-  'cat request-anonymous | git-cvsserver --strict-paths pserver \"$SERVERDIR\" >log 2>&1 &&\n+  'cat request-anonymous | git cvsserver --strict-paths pserver \"$SERVERDIR\" >log 2>&1 &&\n    sed -ne \\$p log | grep \"^I LOVE YOU$\"'\n \n test_expect_success 'req_Root failure (strict-paths)' '\n     ! cat request-anonymous |\n-    git-cvsserver --strict-paths pserver \"$WORKDIR\" >log 2>&1\n+    git cvsserver --strict-paths pserver \"$WORKDIR\" >log 2>&1\n '\n \n test_expect_success 'req_Root (w/o strict-paths)' \\\n-  'cat request-anonymous | git-cvsserver pserver \"$WORKDIR/\" >log 2>&1 &&\n+  'cat request-anonymous | git cvsserver pserver \"$WORKDIR/\" >log 2>&1 &&\n    sed -ne \\$p log | grep \"^I LOVE YOU$\"'\n \n test_expect_success 'req_Root failure (w/o strict-paths)' '\n     ! cat request-anonymous |\n-    git-cvsserver pserver \"$WORKDIR/gitcvs\" >log 2>&1\n+    git cvsserver pserver \"$WORKDIR/gitcvs\" >log 2>&1\n '\n \n cat >request-base  <<EOF\n@@ -180,25 +180,25 @@ Root /gitcvs.git\n EOF\n \n test_expect_success 'req_Root (base-path)' \\\n-  'cat request-base | git-cvsserver --strict-paths --base-path \"$WORKDIR/\" pserver \"$SERVERDIR\" >log 2>&1 &&\n+  'cat request-base | git cvsserver --strict-paths --base-path \"$WORKDIR/\" pserver \"$SERVERDIR\" >log 2>&1 &&\n    sed -ne \\$p log | grep \"^I LOVE YOU$\"'\n \n test_expect_success 'req_Root failure (base-path)' '\n     ! cat request-anonymous |\n-    git-cvsserver --strict-paths --base-path \"$WORKDIR\" pserver \"$SERVERDIR\" >log 2>&1\n+    git cvsserver --strict-paths --base-path \"$WORKDIR\" pserver \"$SERVERDIR\" >log 2>&1\n '\n \n GIT_DIR=\"$SERVERDIR\" git config --bool gitcvs.enabled false || exit 1\n \n test_expect_success 'req_Root (export-all)' \\\n-  'cat request-anonymous | git-cvsserver --export-all pserver \"$WORKDIR\" >log 2>&1 &&\n+  'cat request-anonymous | git cvsserver --export-all pserver \"$WORKDIR\" >log 2>&1 &&\n    sed -ne \\$p log | grep \"^I LOVE YOU$\"'\n \n test_expect_success 'req_Root failure (export-all w/o whitelist)' \\\n-  '! (cat request-anonymous | git-cvsserver --export-all pserver >log 2>&1 || false)'\n+  '! (cat request-anonymous | git cvsserver --export-all pserver >log 2>&1 || false)'\n \n test_expect_success 'req_Root (everything together)' \\\n-  'cat request-base | git-cvsserver --export-all --strict-paths --base-path \"$WORKDIR/\" pserver \"$SERVERDIR\" >log 2>&1 &&\n+  'cat request-base | git cvsserver --export-all --strict-paths --base-path \"$WORKDIR/\" pserver \"$SERVERDIR\" >log 2>&1 &&\n    sed -ne \\$p log | grep \"^I LOVE YOU$\"'\n \n GIT_DIR=\"$SERVERDIR\" git config --bool gitcvs.enabled true || exit 1\ndiff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh\nindex e27a1c5..6b47a7a 100755\n--- a/t/t9401-git-cvsserver-crlf.sh\n+++ b/t/t9401-git-cvsserver-crlf.sh\n@@ -4,10 +4,10 @@\n # Parts adapted from other tests.\n #\n \n-test_description='git-cvsserver -kb modes\n+test_description='git cvsserver -kb modes\n \n tests -kb mode for binary files when accessing a git\n-repository using cvs CLI client via git-cvsserver server'\n+repository using cvs CLI client via git cvsserver server'\n \n . ./test-lib.sh\n \n@@ -49,12 +49,12 @@ not_present() {\n cvs >/dev/null 2>&1\n if test $? -ne 1\n then\n-    test_expect_success 'skipping git-cvsserver tests, cvs not found' :\n+    test_expect_success 'skipping git cvsserver tests, cvs not found' :\n     test_done\n     exit\n fi\n perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {\n-    test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :\n+    test_expect_success 'skipping git cvsserver tests, Perl SQLite interface unavailable' :\n     test_done\n     exit\n }\n-- \n1.6.0.1\n\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"90274","messageId":"7vljy13sq0.fsf@gitster.siamese.dyndns.org","threadId":"15459","inReplyTo":"20080910062529.6117@nanako3.lavabit.com","subject":"Re: [PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-09T21:38:31Z","receivedAt":"2008-09-09T21:38:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi <nanako3@lavabit.com> writes:\n\n> The environment variable CVS_SERVER is still set to \"git-cvsserver\",\n> because tests fail with CVS_SERVER='git cvsserver' (or double quotes).\n\nMy eyes are getting dry after looking at these s/git-/git / patches, so\nplease do not get offended if I leave these in my Inbox unread for a few\ndays.\n\nBut I think this particular one is worth mentioning something about, so I\nam responding to it now.\n\nTo me, the above suggests that:\n\n * we should install git-cvsserver in $(bindir) so that it can be found on\n   $PATH; and\n\n * it would be better to encourage users to consistently use\n   \"git-cvsserver\" everywhere instead of \"git cvsserver\"; hence\n\n * this [6/6] in the series should be discarded.\n\nWe already install \"server side programs\" in $(bindir).\n\nWhen we think about any of these server side programs, we do not think of\nit as a feature chosen by the subcommand word on the command line given to\na program \"git\" (even though for built-ins, internal implementation might\nallow such usage).\n\nInstead we think of it as a single freestanding program in git suite.  For\nexample, when people talk about \"You can use git-shell as your user's\nlogin shell to limit the potential damage to your system\", they do not\nmean \"the shell subcommand of git\", but they mean the git-shell \"program\".\n\nWe do not run \"git in daemon mode\", but run \"git-daemon\" which is the\ndaemon program that serves native git protocol.\n\nSo why don't we do this (not just for test but for documentation as well)?\n\n * We do not use \"git foo\" form when refering to the \"server side\n   programs\".  Make it official;\n\n * We move \"server side programs\" in git(7) documentation into its\n   separate subsection; and\n\n * We always install \"server side programs\" in $(bindir).\n\nI think git-cvsserver is the last one we missed from the set of server\nside programs (git-cvsserver, git-daemon, git-receive-pack,\ngit-upload-archive, git-upload-pack).\n"},{"id":"90278","messageId":"20080909215635.GA4226@coredump.intra.peff.net","threadId":"15459","inReplyTo":"7vljy13sq0.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-09-09T21:56:35Z","receivedAt":"2008-09-09T21:56:35Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Sep 09, 2008 at 02:38:31PM -0700, Junio C Hamano wrote:\n\n> My eyes are getting dry after looking at these s/git-/git / patches, so\n> please do not get offended if I leave these in my Inbox unread for a few\n> days.\n\nI did the same \"look for conversion that should _not_ have occurred\"\ncheck for these patches, and all look sane with two exceptions:\n\n - the cvsserver stuff that you mentioned\n\n - patch 4/6 changes the commit log message in a few cases for some \"git\n   svn\" tests; presumably nothing is caring about the commit id's\n   generated here, but I don't actually have svn installed to run the\n   tests to be sure\n\n> So why don't we do this (not just for test but for documentation as well)?\n> \n>  * We do not use \"git foo\" form when refering to the \"server side\n>    programs\".  Make it official;\n> \n>  * We move \"server side programs\" in git(7) documentation into its\n>    separate subsection; and\n> \n>  * We always install \"server side programs\" in $(bindir).\n> \n> I think git-cvsserver is the last one we missed from the set of server\n> side programs (git-cvsserver, git-daemon, git-receive-pack,\n> git-upload-archive, git-upload-pack).\n\nThat makes perfect sense to me.\n\n-Peff\n"},{"id":"90310","messageId":"7vljy0zlin.fsf@gitster.siamese.dyndns.org","threadId":"15459","inReplyTo":"20080909215635.GA4226@coredump.intra.peff.net","subject":"Re: [PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-10T04:13:04Z","receivedAt":"2008-09-10T04:13:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Tue, Sep 09, 2008 at 02:38:31PM -0700, Junio C Hamano wrote:\n>\n>> My eyes are getting dry after looking at these s/git-/git / patches, so\n>> please do not get offended if I leave these in my Inbox unread for a few\n>> days.\n>\n> I did the same \"look for conversion that should _not_ have occurred\"\n> check for these patches, and all look sane with two exceptions:\n>\n>  - the cvsserver stuff that you mentioned\n>\n>  - patch 4/6 changes the commit log message in a few cases for some \"git\n>    svn\" tests; presumably nothing is caring about the commit id's\n>    generated here, but I don't actually have svn installed to run the\n>    tests to be sure\n\nThanks.  Will make sure I run these tests (I do not know offhand which svn\ntests I am skipping).\n"},{"id":"90342","messageId":"20080910200318.6117@nanako3.lavabit.com","threadId":"15459","inReplyTo":"7vljy13sq0.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-09-10T11:03:18Z","receivedAt":"2008-09-10T11:03:18Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Junio C Hamano <gitster@pobox.com>:\n\n>  * We always install \"server side programs\" in $(bindir).\n>\n> I think git-cvsserver is the last one we missed from the set of server\n> side programs (git-cvsserver, git-daemon, git-receive-pack,\n> git-upload-archive, git-upload-pack).\n\n-- %< --\nSubject: [PATCH] Install git-cvsserver in $(bindir)\n\nIt is one of the server side programs and needs to be found on usual $PATH.\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n Makefile |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex f4c31c8..92a109f 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1368,7 +1368,7 @@ install: all\n \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'\n \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'\n \t$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'\n-\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'\n+\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver$X '$(DESTDIR_SQ)$(bindir_SQ)'\n \t$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install\n \t$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install\n ifndef NO_TCLTK\n-- \n1.6.0.1\n\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"90395","messageId":"7v8wtzvd8h.fsf@gitster.siamese.dyndns.org","threadId":"15459","inReplyTo":"20080910200318.6117@nanako3.lavabit.com","subject":"Re: [PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-10T22:37:50Z","receivedAt":"2008-09-10T22:37:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi <nanako3@lavabit.com> writes:\n\n> Subject: [PATCH] Install git-cvsserver in $(bindir)\n>\n> It is one of the server side programs and needs to be found on usual $PATH.\n>\n> Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n> ...\n> -\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'\n> +\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver$X '$(DESTDIR_SQ)$(bindir_SQ)'\n\nThanks.\n\nWill queue but without $X at the end, as I do not think we want it even on\nWindows because cvsserver is a script.\n"},{"id":"94099","messageId":"20081028111610.GE1682@wo.int.altlinux.org","threadId":"15459","inReplyTo":"7v8wtzvd8h.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","fromName":"Dmitry V. Levin","fromEmail":"ldv@altlinux.org","sentAt":"2008-10-28T11:16:10Z","receivedAt":"2008-10-28T11:16:10Z","isPatch":true,"sender":{"key":"ldv@altlinux.org","avatar":"https://avatars.githubusercontent.com/u/5281408?v=4"},"body":"Hi,\n \nOn Wed, Sep 10, 2008 at 03:37:50PM -0700, Junio C Hamano wrote:\n> Nanako Shiraishi <nanako3@lavabit.com> writes:\n> \n> > Subject: [PATCH] Install git-cvsserver in $(bindir)\n> >\n> > It is one of the server side programs and needs to be found on usual $PATH.\n> >\n> > Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n> > ...\n> > -\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'\n> > +\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver$X '$(DESTDIR_SQ)$(bindir_SQ)'\n> \n> Thanks.\n> \n> Will queue but without $X at the end, as I do not think we want it even on\n> Windows because cvsserver is a script.\n\nPlease apply this compatibility fix (commit v1.6.0.1-308-gede4caf)\nto maint as well.\n\n\n-- \nldv\n"},{"id":"94116","messageId":"7vy708g1a7.fsf@gitster.siamese.dyndns.org","threadId":"15459","inReplyTo":"20081028111610.GE1682@wo.int.altlinux.org","subject":"Re: [PATCH 6/6] t9400, t9401: use \"git cvsserver\" without dash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-28T15:57:52Z","receivedAt":"2008-10-28T15:57:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks; will cherry-pick both.\n"}]}