diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-13 13:29:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-13 13:29:14 -0700 |
| commit | f2a6a1e596cebd55da6144b0fcd42957f6f79455 (patch) | |
| tree | 126f8d2f8921d05296411869ecf2f3f4775ab35d | |
| parent | b2bfd317a375044fa7c1cde2dff79bcfe2a1de91 (diff) | |
| parent | 5acfacc2a125912c2172467fdaa0ef1f5ad6fb82 (diff) | |
| download | git-f2a6a1e596cebd55da6144b0fcd42957f6f79455.tar.xz | |
Merge branch 'jc/sed-build-fixes'
Build fix.
* jc/sed-build-fixes:
build: sed portability fixes
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| -rwxr-xr-x | generate-configlist.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 208e91a17f..de989657fb 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -82,7 +82,7 @@ read GIT_MAJOR_VERSION GIT_MINOR_VERSION GIT_MICRO_VERSION GIT_PATCH_LEVEL trail $(echo "$GIT_VERSION" 0 0 0 0 | tr '.a-zA-Z-' ' ') EOF -REPLACED=$(printf "%s" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \ +REPLACED=$(printf "%s\n" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \ -e "s|@GIT_MAJOR_VERSION@|$GIT_MAJOR_VERSION|" \ -e "s|@GIT_MINOR_VERSION@|$GIT_MINOR_VERSION|" \ -e "s|@GIT_MICRO_VERSION@|$GIT_MICRO_VERSION|" \ diff --git a/generate-configlist.sh b/generate-configlist.sh index 9d2ad6165d..75c39ade20 100755 --- a/generate-configlist.sh +++ b/generate-configlist.sh @@ -13,16 +13,16 @@ print_config_list () { cat <<EOF static const char *config_name_list[] = { EOF - sed -E ' -/^`?[a-zA-Z].*\..*`?::$/ { + sed -e ' + /^`*[a-zA-Z].*\..*`*::$/ { /deprecated/d; s/::$//; s/`//g; s/^.*$/ "&",/; p;}; -d' \ + d' \ "$SOURCE_DIR"/Documentation/*config.adoc \ - "$SOURCE_DIR"/Documentation/config/*.adoc| + "$SOURCE_DIR"/Documentation/config/*.adoc | sort cat <<EOF NULL, |