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

xo-cmake: xo-build: --rejoin on subtree ops

Browse source
This commit is contained in:
Roland Conybeare 2026-05-23 11:03:39 -04:00
commit f62778011c
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/xo-build.in
View file

@ -291,7 +291,7 @@ fi
if [[ $pull_umbrella_remote_flag -eq 1 ]]; then
if [[ -n "$xoname" ]]; then
branch=$(git branch --show-current)
cmd="git subtree pull --prefix=$xoname $xoname ${branch}"
cmd="git subtree pull --rejoin --prefix=$xoname $xoname ${branch}"
if [[ $noop_flag -eq 1 ]]; then
echo $cmd
@ -304,7 +304,7 @@ fi
if [[ $push_umbrella_remote_flag -eq 1 ]]; then
if [[ -n "$xoname" ]]; then
branch=$(git branch --show-current)
cmd="git subtree push --prefix=$xoname $xoname ${branch}"
cmd="git subtree push --rejoin --prefix=$xoname $xoname ${branch}"
if [[ $noop_flag -eq 1 ]]; then
echo $cmd