Skip to content

Commit c5bc42b

Browse files
Ben Waltongitster
authored andcommitted
Avoid bug in Solaris xpg4/sed as used in submodule
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. As we do not need to handle fully qualified paths though, the expression could actually be [^/]+ which isn't properly handled either. Instead, use [^/][^/]*, as suggested by Andreas Schwab, which works on all three tested sed implementations. The new expression is semantically different than the original one. It will not place a leading '..' on a fully qualified path as the original expression did. All of the paths being passed through this regex are relative and did not rely on this behaviour so it's a safe change. Signed-off-by: Ben Walton <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e8dde3e commit c5bc42b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

git-submodule.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,11 @@ module_clone()
167167
a=${a%/}
168168
b=${b%/}
169169

170-
rel=$(echo $b | sed -e 's|[^/]*|..|g')
170+
# Turn each leading "*/" component into "../"
171+
rel=$(echo $b | sed -e 's|[^/][^/]*|..|g')
171172
echo "gitdir: $rel/$a" >"$path/.git"
172173

173-
rel=$(echo $a | sed -e 's|[^/]*|..|g')
174+
rel=$(echo $a | sed -e 's|[^/][^/]*|..|g')
174175
(clear_local_git_env; cd "$path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b")
175176
}
176177

0 commit comments

Comments
 (0)