From dev-return-22526-apmail-couchdb-dev-archive=couchdb.apache.org@couchdb.apache.org Sun Jun 17 21:35:41 2012 Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A8675920A for ; Sun, 17 Jun 2012 21:35:41 +0000 (UTC) Received: (qmail 55145 invoked by uid 500); 17 Jun 2012 21:35:41 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 55114 invoked by uid 500); 17 Jun 2012 21:35:41 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 55106 invoked by uid 99); 17 Jun 2012 21:35:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2012 21:35:41 +0000 X-ASF-Spam-Status: No, hits=0.7 required=5.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [80.244.253.218] (HELO mail.traeumt.net) (80.244.253.218) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2012 21:35:34 +0000 Received: from [10.0.1.185] (unknown [188.21.97.114]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.traeumt.net (Postfix) with ESMTPSA id 4B68514072 for ; Sun, 17 Jun 2012 23:37:29 +0200 (CEST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Apple Message framework v1278) Subject: Re: git commit: Fixup automatic THANKS generation From: Jan Lehnardt In-Reply-To: <20120617205246.DAC6711F9A@tyr.zones.apache.org> Date: Sun, 17 Jun 2012 23:35:12 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <138FDA43-636D-433F-9391-B20F9B371347@apache.org> References: <20120617205246.DAC6711F9A@tyr.zones.apache.org> To: dev@couchdb.apache.org X-Mailer: Apple Mail (2.1278) On Jun 17, 2012, at 22:52 , davisp@apache.org wrote: > Updated Branches: > refs/heads/master d93929fdc -> e64c05061 >=20 >=20 > Fixup automatic THANKS generation >=20 > This avoids the need to use mktemp as well as fixes the removal of the > blank lines in THANKS that we want. This notably does not fix the > dependency issue for AUTHORS.gz on the Git history. Thanks for cleaning this up! :) Not to be overly pedantic, but did you mean THANKS.gz (and THANKS.tmp in the patch). I don't see any connection to AUTHORS[.gz], but I may be missing something very obvious. If it is THANKS.gz, can't we rm -f $@ as the first command in the = target? Cheers Jan --=20 >=20 >=20 > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo > Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e64c0506 > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e64c0506 > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e64c0506 >=20 > Branch: refs/heads/master > Commit: e64c05061c2bbd7bb2d5456e972e61f67486d989 > Parents: d93929f > Author: Paul Joseph Davis > Authored: Sun Jun 17 15:20:21 2012 -0500 > Committer: Paul Joseph Davis > Committed: Sun Jun 17 15:36:02 2012 -0500 >=20 > ---------------------------------------------------------------------- > Makefile.am | 20 +++++++++----------- > THANKS | 2 -- > 2 files changed, 9 insertions(+), 13 deletions(-) > ---------------------------------------------------------------------- >=20 >=20 > = http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/Makefile.am > ---------------------------------------------------------------------- > diff --git a/Makefile.am b/Makefile.am > index 3ffc3df..6646ac9 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -79,17 +79,15 @@ README.gz: $(top_srcdir)/README > -gzip -9 < $< > $@ >=20 > THANKS.gz: $(top_srcdir)/THANKS > - TMP1=3D`mktemp -t THANKS` > - TMP2=3D`mktemp -t THANKS` > - sed -e 's/^#.*//' $< > $TMP1 # strip comments > - sed -e '/^$$/d' $TMP1 > $TMP2 # strip empty lines > - git shortlog -se 6c976bd..HEAD \ > - | grep -v @apache.org \ > - | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \ > - >> $TMP2 # inject git authors > - echo '\nFor a list of authors see the `AUTHORS` file.\n' >> = $TMP2 > - -gzip -9 < $TMP2 > $@ # zip > - rm $TMP1 $TMP2 # cleanup > + @sed -e '/^#.*/d' $< > $(top_builddir)/AUTHORS.tmp > + @git shortlog -se 6c976bd..HEAD \ > + | grep -v @apache.org \ > + | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' = \ > + >> $(top_builddir)/AUTHORS.tmp > + @echo '\nFor a list of authors see the `AUTHORS` file.\n' \ > + >> $(top_builddir)/AUTHORS.tmp > + -gzip -9 < $(top_builddir)/AUTHORS.tmp > $@ > + @rm $(top_builddir)/AUTHORS.tmp >=20 > check: dev check-js > $(top_builddir)/test/etap/run $(top_srcdir)/test/etap >=20 > http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/THANKS > ---------------------------------------------------------------------- > diff --git a/THANKS b/THANKS > index 1e065f8..fc4264d 100644 > --- a/THANKS > +++ b/THANKS > @@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some = of these people are: > * Simon Leblanc > * Rogut=C4=97s Sparnuotos > * Gavin McDonald > - > # Dear committer who merges a commit from a non-committer: > # You don't have to manually maintain the THANKS file anymore (yay!). > # Non-committer authors get automatically appended to THANKS and > # moved into THANKS.gz by `make`. This note will be stripped as well. > # Authors from commit 6c976bd and onwards are auto-inserted. > - >=20