[openwrt/openwrt] build: add explicit --no-show-signature for git

LEDE Commits lede-commits at lists.infradead.org
Tue Feb 20 11:58:46 PST 2024


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/60768064ce5d8801a82a00fe914e6068fbae86e8

commit 60768064ce5d8801a82a00fe914e6068fbae86e8
Author: Oto Šťáva <oto.stava at gmail.com>
AuthorDate: Fri Feb 16 16:28:10 2024 +0100

    build: add explicit --no-show-signature for git
    
    When `log.showSignature` is set, it causes the `SOURCE_DATE_EPOCH` to
    include a textual signature description on OpenPGP-signed commits,
    because Git prints the description into stdout. This then causes some
    scripts to fail because they cannot parse the date from the variable.
    
    Adding an explicit `--no-show-signature` prevents the signatures from
    being displayed even when one has Git configured to show them by
    default, fixing the scripts.
    
    Signed-off-by: Oto Šťáva <oto.stava at gmail.com>
    (cherry picked from commit 1e93208bd2c605704b19fe8b04025c20c17e808d)
---
 scripts/get_source_date_epoch.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/get_source_date_epoch.sh b/scripts/get_source_date_epoch.sh
index d122acf385..727cb0372b 100755
--- a/scripts/get_source_date_epoch.sh
+++ b/scripts/get_source_date_epoch.sh
@@ -15,8 +15,8 @@ try_version() {
 }
 
 try_git() {
-	SOURCE_DATE_EPOCH=$(git -C "$SOURCE" log -1 --format=format:%ct \
-		"$SOURCE" 2>/dev/null)
+	SOURCE_DATE_EPOCH=$(git -C "$SOURCE" log -1 --no-show-signature \
+		--format=format:%ct "$SOURCE" 2>/dev/null)
 	[ -n "$SOURCE_DATE_EPOCH" ]
 }
 




More information about the lede-commits mailing list