[PATCH] Avoid bug in Solaris xpg4/sed as used in submodule
From: Ben Walton <hidden>
Date: 2016-06-15 22:53:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
The sed provided by Solaris in /usr/xpg4/bin has a bug whereby an unanchored regex using * for zero or more repetitions sees two separate matches fed to the substitution engine in some cases. This is evidenced by: $ for sed in /usr/xpg4/bin/sed /usr/bin/sed /opt/csw/gnu/sed; do \ echo 'ab' | $sed -e 's|[a]*|X|g'; \ done XXbX XbX XbX This bug was triggered during a git submodule clone operation as exercised in the setup stage of t5526-fetch-submodules when using the default SANE_TOOL_PATH for Solaris. It led to paths such as ..../.. being used in the submodule .git gitdir reference. Using the expression 's|\([^/]*\(/*\)\)|..\2|g' provides the desired result with all three three tested sed implementations but is harder to read. Instead, use an additional -e script to clean up after the bug on Solaris. The second script will be a functional no-op on most sed implementations. Signed-off-by: Ben Walton <redacted> --- git-submodule.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index efc86ad..0adad22 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh@@ -167,10 +167,12 @@ module_clone() a=${a%/} b=${b%/} - rel=$(echo $b | sed -e 's|[^/]*|..|g') + # Note: The second -e is to work around a bug in Solairs' + # xpg4/sed. It will be a no-op in a working implementation. + rel=$(echo $b | sed -e 's|[^/]*|..|g' -e 's|\.\{4\}|..|g') echo "gitdir: $rel/$a" >"$path/.git" - rel=$(echo $a | sed -e 's|[^/]*|..|g') + rel=$(echo $a | sed -e 's|[^/]*|..|g' -e 's|\.\{4\}|..|g') (clear_local_git_env; cd "$path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b") }
--
1.7.9