max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Test squash subtree merge

Browse Source
This commit is contained in:
Charlton, Scott R 2021-10-30 22:52:20 +00:00
parent 899bbd0755
commit 6487c6837e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -41,12 +41,8 @@ subtree-sync:
##
- cd ..
- rm -rf ${CI_PROJECT_NAME}
- echo about to clone
- echo git clone git@${CI_SERVER_HOST}:${CI_PROJECT_PATH}.git
- git clone git@${CI_SERVER_HOST}:${CI_PROJECT_PATH}.git
- echo finished clone
- cd ${CI_PROJECT_NAME}
- exit 9
##
## Sync subtrees
@ -93,7 +89,8 @@ subtree-sync:
export GIT_EDITOR=true
for remote in "${!urls[@]}"; do
git_subtree "pull" "${prefixes[$remote]}" "$remote" "${urls[$remote]}"
# git_subtree "pull" "${prefixes[$remote]}" "$remote" "${urls[$remote]}"
git subtree pull --prefix "${prefixes[$remote]}" --squash "${urls[$remote]}" master
done
for remote in "${!urls[@]}"; do