33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
|
From b235076a7df96253aa41a7859c3ba54386bd3fef Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Sat, 20 Nov 2021 17:50:25 +0000
|
||
|
|
Subject: [PATCH] Revert "podwrapper.pl.in: Use short commit date"
|
||
|
|
|
||
|
|
This commit breaks man page output because there is an extra newline
|
||
|
|
after the date which wasn't being removed.
|
||
|
|
|
||
|
|
This reverts commit 7a1e79c6b5ca4adcef47fc0929d25d54610fc417.
|
||
|
|
|
||
|
|
(cherry picked from commit 750ad5972bb082d188f17f8f71ef1ec0c616c676)
|
||
|
|
---
|
||
|
|
podwrapper.pl.in | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/podwrapper.pl.in b/podwrapper.pl.in
|
||
|
|
index 63c1025a..abad578d 100755
|
||
|
|
--- a/podwrapper.pl.in
|
||
|
|
+++ b/podwrapper.pl.in
|
||
|
|
@@ -233,7 +233,8 @@ my $date;
|
||
|
|
my $filename = "$abs_top_srcdir/.git";
|
||
|
|
if (!$date && -d $filename) {
|
||
|
|
local $ENV{GIT_DIR} = $filename;
|
||
|
|
- $date = `git show -O/dev/null -s --format=%cs`;
|
||
|
|
+ $_ = `git show -O/dev/null -s --format=%ci`;
|
||
|
|
+ $date = $1 if /^(\d+-\d+-\d+)\s/;
|
||
|
|
}
|
||
|
|
if (!$date) {
|
||
|
|
my ($day, $month, $year) = (gmtime($ENV{SOURCE_DATE_EPOCH} || time))[3,4,5];
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|