summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xbuild-aux/gitlog-to-changelog4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6806847dc6..ddd205e169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-07-29 Akim Demaille <akim@lrde.epita.fr>
+ gitlog-to-changelog: fix previous change
+ * build-aux/gitlog-to-changelog: Fix condition.
+ Add missing ";".
+
+2012-07-29 Akim Demaille <akim@lrde.epita.fr>
+
gitlog-to-changelog: don't expect .git to be in $srcdir
Reported by Bruno Haible.
<http://lists.gnu.org/archive/html/bug-gnulib/2012-07/msg00265.html>
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 60e1c39e17..5184edc7d2 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -210,8 +210,8 @@ sub git_dir_option($)
my $git_dir = qx($cmd);
defined $git_dir
or die "$ME: cannot run $qcmd: $!\n";
- $? != 0
- or die "$ME: $qcmd had unexpected exit code or signal ($?)\n"
+ $? == 0
+ or die "$ME: $qcmd had unexpected exit code or signal ($?)\n";
chomp $git_dir;
push @res, "--git-dir=$git_dir/.git";
}