[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 02/02: git-describe(1) will usually emit 7 hexadecimal digits as the abbreviated object name, However, as this can be user-dependent, pass --abbrev=0 to ensure it does not vary between systems. This also means we do not need to strip it ourselves.



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit 609114d5832f15242c212a5cb25f8956fdfb5f77
Author: Chris Lamb <lamby@debian.org>
Date:   Wed Sep 20 09:15:44 2017 +0100

    git-describe(1) will usually emit 7 hexadecimal digits as the abbreviated object name, However, as this can be user-dependent, pass --abbrev=0 to ensure it does not vary between systems. This also means we do not need to strip it ourselves.
---
 debian/changelog             | 5 +++++
 private/generate-tag-summary | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81c0683..ada4fca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -180,6 +180,11 @@ lintian (2.5.53) UNRELEASED; urgency=medium
     + [CL] Add missing entries in "Test-For" fields to make
       development/testing workflow less error-prone.
 
+  * private/generate-tag-summary:
+    + [CL] git-describe(1) will usually emit 7 hexadecimal digits as the
+      abbreviated object name,  However, as this can be user-dependent,
+      pass --abbrev=0 to ensure it does not vary between systems.  This
+      also means we do not need to strip it ourselves.
   * private/refresh-*:
     + [CL] Use deb.debian.org as the default mirror.
     + [CL] Update locations of Contents-<arch> files; they are now
diff --git a/private/generate-tag-summary b/private/generate-tag-summary
index 965c422..ad22a8e 100755
--- a/private/generate-tag-summary
+++ b/private/generate-tag-summary
@@ -30,7 +30,7 @@ Getopt::Long::GetOptions(%opthash)
 
 my ($commit_range) = @ARGV;
 if (not $commit_range) {
-    my $describe = safe_qx(qw(git describe));
+    my $describe = safe_qx(qw(git describe --abbrev=0));
     if ($? != 0) {
         die 'git describe failed with code ' . (($? >> 8) & 0xff);
     }
@@ -38,7 +38,6 @@ if (not $commit_range) {
     if (not $describe) {
         die "git describe did not return anything.\n";
     }
-    $describe =~ s/-\d+-g[0-9a-fA-F]{7}$//;
     $commit_range = "${describe}..HEAD";
     print "Assuming commit range to be: ${commit_range}\n";
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: