Improve sed portability

Chris Ridd · gitster · commit fe22e5420ee5 · 2008-06-12T22:20:18.000-07:00
The behaviour of "sed" on an incomplete line is unspecified by POSIX, and
On Solaris it apparently fails to process input that doesn't end in a LF.

Consequently constructs like

  re=$(printf '%s' foo | sed -e 's/bar/BAR/g' $)

cause re to be set to the empty string. Such a construct is used in
git-submodule.sh.

Because the LF at the end of command output are stripped away by the
command substitution, it is a safe and sane change to add a LF at the end
of the printf format specifier.

Signed-off-by: Chris Ridd &lt;chris.ridd@isode.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-submodule.sh b/git-submodule.sh
@@ -73,7 +73,7 @@ resolve_relative_url ()
 module_name()
 {
 	# Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
-	re=$(printf '%s' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
+	re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
 	name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
 		sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
        test -z "$name" &&

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ resolve_relative_url ()`
`73`	`73`	`module_name()`
`74`	`74`	`{`
`75`	`75`	`# Do we have "submodule.<something>.path = $1" defined in .gitmodules file?`
`76`		`- re=$(printf '%s' "$1" \| sed -e 's/[].[^$\\*]/\\&/g')`
	`76`	`+ re=$(printf '%s\n' "$1" \| sed -e 's/[].[^$\\*]/\\&/g')`
`77`	`77`	`name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' \|`
`78`	`78`	`sed -n -e 's\|^submodule\.\(.*\)\.path '"$re"'$\|\1\|p' )`
`79`	`79`	`test -z "$name" &&`