Mercurial > hg > octave-lyh > gnulib-hg
changeset 16996:f6ae6de0b7a4
gitlog-to-changelog: VPATH build issues.
If builddir is not a subdirectory of srcdir, running git from it will
fail.
* build-aux/gitlog-to-changelog (--srcdir): New option.
author | Akim Demaille <akim@lrde.epita.fr> |
---|---|
date | Sun, 15 Jul 2012 16:22:31 +0200 |
parents | cc9be652c57c |
children | efd55e9041c8 |
files | ChangeLog build-aux/gitlog-to-changelog |
diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-07-15 Akim Demaille <akim@lrde.epita.fr> + + gitlog-to-changelog: VPATH build issues + If builddir is not a subdirectory of srcdir, running git from it will + fail. + * build-aux/gitlog-to-changelog (--srcdir): New option. + 2012-07-15 Bruno Haible <bruno@clisp.org> fpending: Assume AC_CHECK_DECLS_ONCE invocation, like in fpending.m4.
--- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,7 +3,7 @@ if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2012-05-22 09:40'; # UTC +my $VERSION = '2012-07-16 18:34'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -68,6 +68,7 @@ header; the default is to cluster adjacent commit messages if their headers are the same and neither commit message contains multiple paragraphs. + --srcdir=DIR the root of the source tree, containing the '.git' directory. --since=DATE convert only the logs since DATE; the default is to convert all log entries. --format=FMT set format string for commit subject and body; @@ -200,6 +201,7 @@ my $cluster = 1; my $strip_tab = 0; my $strip_cherry_pick = 0; + my $srcdir; GetOptions ( help => sub { usage 0 }, @@ -211,9 +213,9 @@ 'cluster!' => \$cluster, 'strip-tab' => \$strip_tab, 'strip-cherry-pick' => \$strip_cherry_pick, + 'srcdir=s' => \$srcdir, ) or usage 1; - defined $since_date and unshift @ARGV, "--since=$since_date"; @@ -221,7 +223,9 @@ # that makes a correction in the log or attribution of that commit. my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {}; - my @cmd = (qw (git log --log-size), + my @cmd = ('git', + defined $srcdir ? ("--git-dir=$srcdir/.git") : (), + qw(log --log-size), '--pretty=format:%H:%ct %an <%ae>%n%n'.$format_string, @ARGV); open PIPE, '-|', @cmd or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n"