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

git subtree pull now squashes

Browse Source
This commit is contained in:
Charlton, Scott R 2021-10-31 18:20:51 +00:00
parent f715edb589
commit f1fa927adf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -1,6 +1,7 @@
# #
# https://code.chs.usgs.gov/coupled/subtrees/iphreeqc-src # https://code.chs.usgs.gov/coupled/subtrees/iphreeqc-src
# SRC 2020-12-02T18:39:55-07:00 # SRC 2020-12-02T18:39:55-07:00
# SRC 2021-10-31T12:20:11-06:00 -- changed pull to squash -- HEAD:f715edb5897985acf0692d2b0bde4ab34379469f
# #
image: ${CI_REGISTRY}/coupled/containers/buildpack-deps:bionic-scm image: ${CI_REGISTRY}/coupled/containers/buildpack-deps:bionic-scm
@ -81,7 +82,8 @@ subtree-sync:
export GIT_EDITOR=true export GIT_EDITOR=true
for remote in "${!urls[@]}"; do 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 done
for remote in "${!urls[@]}"; do for remote in "${!urls[@]}"; do