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

Add some more git flags for safety

develop
lethosor 2021-02-18 23:22:37 -05:00
parent 5d9d51e327
commit 24c499c108
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/update-submodules.yml vendored
Unescape Escape View File

@ -25,5 +25,5 @@ jobs:
git config user.name "DFHack-Urist via GitHub Actions" git config user.name "DFHack-Urist via GitHub Actions"
git config user.email "DFHack-Urist@users.noreply.github.com" git config user.email "DFHack-Urist@users.noreply.github.com"
if bash -x ci/update-submodules.bash; then if bash -x ci/update-submodules.bash; then
git push git push --recurse-submodules=check
fi fi

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

@ -22,7 +22,7 @@ cat ci/update-submodules.manifest | while read path branch; do
cd "${git_root}/${path}" cd "${git_root}/${path}"
test "${git_root}" != "$(get_git_root)" test "${git_root}" != "$(get_git_root)"
git checkout "${branch}" git checkout "${branch}"
git pull 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
git add "${path}" git add "${path}"