[PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Nanako Shiraishi]

The environment variable CVS_SERVER is still set to "git-cvsserver",
because tests fail with CVS_SERVER='git cvsserver' (or double quotes).

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
---
 t/t9400-git-cvsserver-server.sh |   38 +++++++++++++++++++-------------------
 t/t9401-git-cvsserver-crlf.sh   |    8 ++++----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index c1850d2..1ef0a06 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -3,22 +3,22 @@
 # Copyright (c) 2007 Frank Lichtenheld
 #
 
-test_description='git-cvsserver access
+test_description='git cvsserver access
 
 tests read access to a git repository with the
-cvs CLI client via git-cvsserver server'
+cvs CLI client via git cvsserver server'
 
 . ./test-lib.sh
 
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then
-    test_expect_success 'skipping git-cvsserver tests, cvs not found' :
+    test_expect_success 'skipping git cvsserver tests, cvs not found' :
     test_done
     exit
 fi
 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
-    test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :
+    test_expect_success 'skipping git cvsserver tests, Perl SQLite interface unavailable' :
     test_done
     exit
 }
@@ -93,11 +93,11 @@ END VERIFICATION REQUEST
 EOF
 
 test_expect_success 'pserver authentication' \
-  'cat request-anonymous | git-cvsserver pserver >log 2>&1 &&
+  'cat request-anonymous | git cvsserver pserver >log 2>&1 &&
    sed -ne \$p log | grep "^I LOVE YOU$"'
 
 test_expect_success 'pserver authentication failure (non-anonymous user)' \
-  'if cat request-git | git-cvsserver pserver >log 2>&1
+  'if cat request-git | git cvsserver pserver >log 2>&1
    then
        false
    else
@@ -106,11 +106,11 @@ test_expect_success 'pserver authentication failure (non-anonymous user)' \
    sed -ne \$p log | grep "^I HATE YOU$"'
 
 test_expect_success 'pserver authentication (login)' \
-  'cat login-anonymous | git-cvsserver pserver >log 2>&1 &&
+  'cat login-anonymous | git cvsserver pserver >log 2>&1 &&
    sed -ne \$p log | grep "^I LOVE YOU$"'
 
 test_expect_success 'pserver authentication failure (login/non-anonymous user)' \
-  'if cat login-git | git-cvsserver pserver >log 2>&1
+  'if cat login-git | git cvsserver pserver >log 2>&1
    then
        false
    else
@@ -139,7 +139,7 @@ Root $WORKDIR
 EOF
 
 test_expect_success 'req_Root failure (relative pathname)' \
-  'if cat request-relative | git-cvsserver pserver >log 2>&1
+  'if cat request-relative | git cvsserver pserver >log 2>&1
    then
        echo unexpected success
        false
@@ -149,25 +149,25 @@ test_expect_success 'req_Root failure (relative pathname)' \
    tail log | grep "^error 1 Root must be an absolute pathname$"'
 
 test_expect_success 'req_Root failure (conflicting roots)' \
-  'cat request-conflict | git-cvsserver pserver >log 2>&1 &&
+  'cat request-conflict | git cvsserver pserver >log 2>&1 &&
    tail log | grep "^error 1 Conflicting roots specified$"'
 
 test_expect_success 'req_Root (strict paths)' \
-  'cat request-anonymous | git-cvsserver --strict-paths pserver "$SERVERDIR" >log 2>&1 &&
+  'cat request-anonymous | git cvsserver --strict-paths pserver "$SERVERDIR" >log 2>&1 &&
    sed -ne \$p log | grep "^I LOVE YOU$"'
 
 test_expect_success 'req_Root failure (strict-paths)' '
     ! cat request-anonymous |
-    git-cvsserver --strict-paths pserver "$WORKDIR" >log 2>&1
+    git cvsserver --strict-paths pserver "$WORKDIR" >log 2>&1
 '
 
 test_expect_success 'req_Root (w/o strict-paths)' \
-  'cat request-anonymous | git-cvsserver pserver "$WORKDIR/" >log 2>&1 &&
+  'cat request-anonymous | git cvsserver pserver "$WORKDIR/" >log 2>&1 &&
    sed -ne \$p log | grep "^I LOVE YOU$"'
 
 test_expect_success 'req_Root failure (w/o strict-paths)' '
     ! cat request-anonymous |
-    git-cvsserver pserver "$WORKDIR/gitcvs" >log 2>&1
+    git cvsserver pserver "$WORKDIR/gitcvs" >log 2>&1
 '
 
 cat >request-base  <<EOF
@@ -180,25 +180,25 @@ Root /gitcvs.git
 EOF
 
 test_expect_success 'req_Root (base-path)' \
-  'cat request-base | git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
+  'cat request-base | git cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
    sed -ne \$p log | grep "^I LOVE YOU$"'
 
 test_expect_success 'req_Root failure (base-path)' '
     ! cat request-anonymous |
-    git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" >log 2>&1
+    git cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" >log 2>&1
 '
 
 GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false || exit 1
 
 test_expect_success 'req_Root (export-all)' \
-  'cat request-anonymous | git-cvsserver --export-all pserver "$WORKDIR" >log 2>&1 &&
+  'cat request-anonymous | git cvsserver --export-all pserver "$WORKDIR" >log 2>&1 &&
    sed -ne \$p log | grep "^I LOVE YOU$"'
 
 test_expect_success 'req_Root failure (export-all w/o whitelist)' \
-  '! (cat request-anonymous | git-cvsserver --export-all pserver >log 2>&1 || false)'
+  '! (cat request-anonymous | git cvsserver --export-all pserver >log 2>&1 || false)'
 
 test_expect_success 'req_Root (everything together)' \
-  'cat request-base | git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
+  'cat request-base | git cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" >log 2>&1 &&
    sed -ne \$p log | grep "^I LOVE YOU$"'
 
 GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true || exit 1
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index e27a1c5..6b47a7a 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -4,10 +4,10 @@
 # Parts adapted from other tests.
 #
 
-test_description='git-cvsserver -kb modes
+test_description='git cvsserver -kb modes
 
 tests -kb mode for binary files when accessing a git
-repository using cvs CLI client via git-cvsserver server'
+repository using cvs CLI client via git cvsserver server'
 
 . ./test-lib.sh
 
@@ -49,12 +49,12 @@ not_present() {
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then
-    test_expect_success 'skipping git-cvsserver tests, cvs not found' :
+    test_expect_success 'skipping git cvsserver tests, cvs not found' :
     test_done
     exit
 fi
 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
-    test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :
+    test_expect_success 'skipping git cvsserver tests, Perl SQLite interface unavailable' :
     test_done
     exit
 }
-- 
1.6.0.1


-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

Re: [PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Junio C Hamano]

Nanako Shiraishi <nanako3@lavabit.com> writes:

> The environment variable CVS_SERVER is still set to "git-cvsserver",
> because tests fail with CVS_SERVER='git cvsserver' (or double quotes).

My eyes are getting dry after looking at these s/git-/git / patches, so
please do not get offended if I leave these in my Inbox unread for a few
days.

But I think this particular one is worth mentioning something about, so I
am responding to it now.

To me, the above suggests that:

 * we should install git-cvsserver in $(bindir) so that it can be found on
   $PATH; and

 * it would be better to encourage users to consistently use
   "git-cvsserver" everywhere instead of "git cvsserver"; hence

 * this [6/6] in the series should be discarded.

We already install "server side programs" in $(bindir).

When we think about any of these server side programs, we do not think of
it as a feature chosen by the subcommand word on the command line given to
a program "git" (even though for built-ins, internal implementation might
allow such usage).

Instead we think of it as a single freestanding program in git suite.  For
example, when people talk about "You can use git-shell as your user's
login shell to limit the potential damage to your system", they do not
mean "the shell subcommand of git", but they mean the git-shell "program".

We do not run "git in daemon mode", but run "git-daemon" which is the
daemon program that serves native git protocol.

So why don't we do this (not just for test but for documentation as well)?

 * We do not use "git foo" form when refering to the "server side
   programs".  Make it official;

 * We move "server side programs" in git(7) documentation into its
   separate subsection; and

 * We always install "server side programs" in $(bindir).

I think git-cvsserver is the last one we missed from the set of server
side programs (git-cvsserver, git-daemon, git-receive-pack,
git-upload-archive, git-upload-pack).

Re: [PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Nanako Shiraishi]

Quoting Junio C Hamano <gitster@pobox.com>:

> Nanako Shiraishi <nanako3@lavabit.com> writes:
>
>> The environment variable CVS_SERVER is still set to "git-cvsserver",
>> because tests fail with CVS_SERVER='git cvsserver' (or double quotes).
>
> My eyes are getting dry after looking at these s/git-/git / patches, so
> please do not get offended if I leave these in my Inbox unread for a few
> days.

No problem.

> So why don't we do this (not just for test but for documentation as well)?
>
>  * We do not use "git foo" form when refering to the "server side
>    programs".  Make it official;
>
>  * We move "server side programs" in git(7) documentation into its
>    separate subsection; and
>
>  * We always install "server side programs" in $(bindir).
>
> I think git-cvsserver is the last one we missed from the set of server
> side programs (git-cvsserver, git-daemon, git-receive-pack,
> git-upload-archive, git-upload-pack).

Thanks for your comments; it makes sense to me.  I have to leave for work now, so please expect no progress nor response from me until evening.


-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

Re: [PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Jeff King]

On Tue, Sep 09, 2008 at 02:38:31PM -0700, Junio C Hamano wrote:

> My eyes are getting dry after looking at these s/git-/git / patches, so
> please do not get offended if I leave these in my Inbox unread for a few
> days.

I did the same "look for conversion that should _not_ have occurred"
check for these patches, and all look sane with two exceptions:

 - the cvsserver stuff that you mentioned

 - patch 4/6 changes the commit log message in a few cases for some "git
   svn" tests; presumably nothing is caring about the commit id's
   generated here, but I don't actually have svn installed to run the
   tests to be sure

> So why don't we do this (not just for test but for documentation as well)?
> 
>  * We do not use "git foo" form when refering to the "server side
>    programs".  Make it official;
> 
>  * We move "server side programs" in git(7) documentation into its
>    separate subsection; and
> 
>  * We always install "server side programs" in $(bindir).
> 
> I think git-cvsserver is the last one we missed from the set of server
> side programs (git-cvsserver, git-daemon, git-receive-pack,
> git-upload-archive, git-upload-pack).

That makes perfect sense to me.

-Peff

Re: [PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> On Tue, Sep 09, 2008 at 02:38:31PM -0700, Junio C Hamano wrote:
>
>> My eyes are getting dry after looking at these s/git-/git / patches, so
>> please do not get offended if I leave these in my Inbox unread for a few
>> days.
>
> I did the same "look for conversion that should _not_ have occurred"
> check for these patches, and all look sane with two exceptions:
>
>  - the cvsserver stuff that you mentioned
>
>  - patch 4/6 changes the commit log message in a few cases for some "git
>    svn" tests; presumably nothing is caring about the commit id's
>    generated here, but I don't actually have svn installed to run the
>    tests to be sure

Thanks.  Will make sure I run these tests (I do not know offhand which svn
tests I am skipping).

Re: [PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Nanako Shiraishi]

Quoting Junio C Hamano <gitster@pobox.com>:

>  * We always install "server side programs" in $(bindir).
>
> I think git-cvsserver is the last one we missed from the set of server
> side programs (git-cvsserver, git-daemon, git-receive-pack,
> git-upload-archive, git-upload-pack).

-- %< --
Subject: [PATCH] Install git-cvsserver in $(bindir)

It is one of the server side programs and needs to be found on usual $PATH.

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index f4c31c8..92a109f 100644
--- a/Makefile
+++ b/Makefile
@@ -1368,7 +1368,7 @@ install: all
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'
+	$(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)'
 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
 ifndef NO_TCLTK
-- 
1.6.0.1


-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

Re: [PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Junio C Hamano]

Nanako Shiraishi <nanako3@lavabit.com> writes:

> Subject: [PATCH] Install git-cvsserver in $(bindir)
>
> It is one of the server side programs and needs to be found on usual $PATH.
>
> Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
> ...
> -	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'
> +	$(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)'

Thanks.

Will queue but without $X at the end, as I do not think we want it even on
Windows because cvsserver is a script.

Re: [PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 845 bytes --]

Hi,
 
On Wed, Sep 10, 2008 at 03:37:50PM -0700, Junio C Hamano wrote:
> Nanako Shiraishi <nanako3@lavabit.com> writes:
> 
> > Subject: [PATCH] Install git-cvsserver in $(bindir)
> >
> > It is one of the server side programs and needs to be found on usual $PATH.
> >
> > Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
> > ...
> > -	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'
> > +	$(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)'
> 
> Thanks.
> 
> Will queue but without $X at the end, as I do not think we want it even on
> Windows because cvsserver is a script.

Please apply this compatibility fix (commit v1.6.0.1-308-gede4caf)
to maint as well.


-- 
ldv

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH 6/6] t9400, t9401: use "git cvsserver" without dash

[Junio C Hamano]

Thanks; will cherry-pick both.