git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Trond Hasle Amundsen <t.h.amundsen@usit.uio.no>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] contrib/hooks/post-receive-email: get description from repo.git/config
Date: Mon, 06 May 2013 18:26:48 +0200	[thread overview]
Message-ID: <15t38u0cbw7.fsf@tux.uio.no> (raw)
In-Reply-To: <7vtxmgruhc.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Mon, 06 May 2013 08:36:15 -0700")

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

> But when you send a patch the next time around, please have the
> above and the next three lines (i.e. "introductory text") _below_
> the three-dash line.

Allright, noted.

>> From 878a7af9088e2bcc3afc9b09b9023f1f188c844b Mon Sep 17 00:00:00 2001
>> From: Trond Hasle Amundsen <t.h.amundsen@usit.uio.no>
>> Date: Mon, 6 May 2013 15:41:25 +0200
>> Subject: [PATCH] contrib/hooks/post-receive-email: get description from repo.git/config
>
> And remove these five lines above.  We will read the authorship and
> subject from the e-mail header of your message.

So many rules.. ;) Also noted.

>> +projectdesc=$(git config gitweb.description)
>> +if [ -f "$GIT_DIR/description" ]; then
>> +        projectdesc=$(sed -ne '1p' "$GIT_DIR/description" 2>/dev/null)
>> +fi
>> +
>>  # Check if the description is unchanged from it's default, and shorten it to
>>  # a more manageable length if it is
>>  if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null
>
> If description file takes precedence, then the right order to do
> this would be
>
>     projectdesc=$(sed -ne 1p "$GIT_DIR/description" 2>/dev/null)
>     if expr "$projectdesc" : "Unnamed repository" >/dev/null
>     then
>             : use it as is
>     elif projectdesc=$(git config gitweb.description)
>     then
>             : use it as is
>     else
>             projectdesc="UNNAMED PROJECT"
>     fi
>
> to avoid calling "git config" when it is not even necessary.

That doesn't work, you'll always call "git config" unless the string
matches "Unnamed repository". If you negate the expr line it still
doesn't work. To avoid calling "git config" I'd rather suggest something
like this:

  projectdesc=$(sed -ne 1p "$GIT_DIR/description" 2>/dev/null)
  if [ -z "$projectdesc" ]; then
          projectdesc=$(git config gitweb.description)
  fi

And let this block remain intact:

  if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null
  then
          projectdesc="UNNAMED PROJECT"
  fi

The only change would then be the three added lines containing the if
block that calls "git config" if the "projectdesc" variable is
empty. The idea is just to get the description from config if the
description file doesn't exist.

Just curious.. why would we avoid calling "git config" unless necessary?

Regards,
-- 
Trond H. Amundsen <t.h.amundsen@usit.uio.no>
Center for Information Technology Services, University of Oslo

      parent reply	other threads:[~2013-05-06 16:26 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-06 13:53 [PATCH] contrib/hooks/post-receive-email: get description from repo.git/config Trond Hasle Amundsen
2013-05-06 15:22 ` Trond Hasle Amundsen
2013-05-06 15:36 ` Junio C Hamano
2013-05-06 15:42   ` Matthieu Moy
2013-05-06 16:29     ` Trond Hasle Amundsen
2013-05-07  6:36     ` Junio C Hamano
2013-05-07  7:46       ` Michael Haggerty
2013-05-07 15:15         ` Junio C Hamano
2013-05-07 15:36           ` Matthieu Moy
2013-07-01 21:58         ` Junio C Hamano
2013-07-02  9:12           ` Michael Haggerty
2013-07-02 18:51             ` Junio C Hamano
2013-05-07  7:49       ` Matthieu Moy
2013-05-07 14:51         ` Junio C Hamano
2013-05-06 16:26   ` Trond Hasle Amundsen [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=15t38u0cbw7.fsf@tux.uio.no \
    --to=t.h.amundsen@usit.uio.no \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).