]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/sed-build-fixes'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Jun 2025 20:29:14 +0000 (13:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jun 2025 20:29:14 +0000 (13:29 -0700)
Build fix.

* jc/sed-build-fixes:
  build: sed portability fixes

1  2 
GIT-VERSION-GEN
generate-configlist.sh

diff --cc GIT-VERSION-GEN
Simple merge
index 9d2ad6165d60cd62f92476416dff9e6030dcad1f,f25cb9fc3efd93e71bf418025608355e3317c528..75c39ade20939dee89090da80e61c330bf8b84a9
@@@ -19,10 -19,11 +19,10 @@@ EO
        s/::$//;
        s/`//g;
        s/^.*$/ "&",/;
 -      s/,  */",\n     "/g;
        p;};
- d' \
      d' \
            "$SOURCE_DIR"/Documentation/*config.adoc \
-           "$SOURCE_DIR"/Documentation/config/*.adoc|
+           "$SOURCE_DIR"/Documentation/config/*.adoc |
        sort
        cat <<EOF
        NULL,