Recently generating the version-def.h file and the config-list.h file have been updated, which broke versions of "sed" that do not want to be fed a file that ends with an incomplete line, and/or that do not understand the more recent "-E" option to use extended regular expression. Fix them in response to a build-failure reported on Solaris boxes. cf. https://lore.kernel.org/git/09f954b8-d9c3-418f-ad4b-9cb9b063f4ae@xxxxxxxxxxxx/ Reported-by: Brad Smith <brad@xxxxxxxxxxxx> Reviewed-by: Collin Funk <collin.funk1@xxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- * This time with a proposed log message. I may fast-track it down to 'master' before the release. I personally am undecided, and I do know that I hate the style of this particular sed script and am tempted to fix it before committing, but I'll refrain from doing so before the release. GIT-VERSION-GEN | 2 +- generate-configlist.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1047b8d11d..ad3aa59045 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, -- 2.50.0-rc2-215-g56f75d5edf
