pull modification from split replositories before push

This commit is contained in:
KHOUBZA Younes
2021-05-02 13:12:40 +00:00
parent 8c617b8084
commit 562e8ff38c
+2 -1
View File
@@ -7,8 +7,9 @@ CURRENT_BRANCH="main"
function split()
{
git merge --strategy recursive --strategy-option subtree="$1" "$2/$CURRENT_BRANCH" --allow-unrelated-histories -m "Merge remote-tracking branch '$2/$CURRENT_BRANCH'"
SHA1=$(./bin/splitsh-lite --prefix="$1")
git push "$2" "$SHA1:refs/heads/$CURRENT_BRANCH" -f
git push $2 "$SHA1:refs/heads/$CURRENT_BRANCH" -f
}
function remote()