roland/xo-umbrella2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-cmake: explicit demux branch for pushing subtrees

Browse source
This commit is contained in:
Roland Conybeare 2026-05-23 11:17:04 -04:00
commit ab8a7dbe9c
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
xo-cmake/bin/xo-build.in
View file

@ -278,7 +278,8 @@ fi
if [[ $split_umbrella_remote_flag -eq 1 ]]; then
if [[ -n "$xoname" ]]; then
#branch=$(git branch --show-current)
cmd="git subtree split --rejoin --prefix=$xoname"
demux_branch=_demux/$xoname
cmd="git subtree split --rejoin --prefix=$xoname -b ${demux_branch}"
if [[ $noop_flag -eq 1 ]]; then
echo $cmd
@ -304,12 +305,19 @@ fi
if [[ $push_umbrella_remote_flag -eq 1 ]]; then
if [[ -n "$xoname" ]]; then
branch=$(git branch --show-current)
cmd="git subtree push --rejoin --prefix=$xoname $xoname ${branch}"
demux_branch=_demux/$xoname
cmd1="git subtree split --rejoin --prefix=$xoname -b ${demux_branch}"
remote=${xoname}
remote_branch=${branch}
cmd2="git push ${remote} ${demux_branch}:${remote_branch}"
#cmd="git subtree push --rejoin --prefix=$xoname $xoname ${branch}"
if [[ $noop_flag -eq 1 ]]; then
echo $cmd
echo $cmd1
echo $cmd2
else
$cmd
$cmd1
$cmd2
fi
fi
fi