MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update-submodules: fix accidentally hardcoded branch name

develop
lethosor 2021-08-11 22:08:25 -04:00
parent a9c7be7a60
commit 5a076df305
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/update-submodules.bash
Unescape Escape View File

@ -23,7 +23,7 @@ cat ci/update-submodules.manifest | while read path branch; do
test "${git_root}" != "$(get_git_root)" test "${git_root}" != "$(get_git_root)"
git fetch origin "${branch}:${branch}" git fetch origin "${branch}:${branch}"
git checkout "${branch}" git checkout "${branch}"
git branch --set-upstream-to="origin/${branch}" dfhack git branch --set-upstream-to="origin/${branch}" "${branch}"
git pull --ff-only git pull --ff-only
cd "${git_root}" cd "${git_root}"
if ! git diff --quiet --ignore-submodules=dirty -- "${path}"; then if ! git diff --quiet --ignore-submodules=dirty -- "${path}"; then