From a9c7be7a6081d3c993bc037c29dc393c9ae020bf Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 11 Aug 2021 22:04:05 -0400 Subject: [PATCH] update-submodules: hopefully fix pulling This was the last failure. Unsure why this doesn't occur with other submodules. https://github.com/DFHack/dfhack/runs/3307299302?check_suite_focus=true ``` + git checkout dfhack Previous HEAD position was 19b52ca 0.15.0 release Switched to branch 'dfhack' + git pull --ff-only There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull If you wish to set tracking information for this branch you can do so with: git branch --set-upstream-to=origin/ dfhack ``` --- ci/update-submodules.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/update-submodules.bash b/ci/update-submodules.bash index bebd9fe7d..cd94fb441 100755 --- a/ci/update-submodules.bash +++ b/ci/update-submodules.bash @@ -23,6 +23,7 @@ cat ci/update-submodules.manifest | while read path branch; do test "${git_root}" != "$(get_git_root)" git fetch origin "${branch}:${branch}" git checkout "${branch}" + git branch --set-upstream-to="origin/${branch}" dfhack git pull --ff-only cd "${git_root}" if ! git diff --quiet --ignore-submodules=dirty -- "${path}"; then