diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:27:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:27:58 -0700 |
| commit | c83645a642e40bf6a4a2365ceb1950baf406ec34 (patch) | |
| tree | 998d5df364b55cebf2d60c89122743d7c610ed89 | |
| parent | 25047b88965c8954e0599fe20c88b6a03c3ee506 (diff) | |
| parent | c5bc42b9b7bfa8dc2e769c4549572265af259d12 (diff) | |
| download | git-c83645a642e40bf6a4a2365ceb1950baf406ec34.tar.gz git-c83645a642e40bf6a4a2365ceb1950baf406ec34.tar.xz | |
Merge branch 'bw/submodule-sed-solaris' into maint
By Ben Walton
* bw/submodule-sed-solaris:
Avoid bug in Solaris xpg4/sed as used in submodule
| -rwxr-xr-x | git-submodule.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index efc86ad4e..3d94a1407 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -167,10 +167,11 @@ module_clone() a=${a%/} b=${b%/} - rel=$(echo $b | sed -e 's|[^/]*|..|g') + # Turn each leading "*/" component into "../" + rel=$(echo $b | sed -e 's|[^/][^/]*|..|g') echo "gitdir: $rel/$a" >"$path/.git" - rel=$(echo $a | sed -e 's|[^/]*|..|g') + rel=$(echo $a | sed -e 's|[^/][^/]*|..|g') (clear_local_git_env; cd "$path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b") } |