Skip to content

Commit

Permalink
fix check on return-code from git-pull
Browse files Browse the repository at this point in the history
  • Loading branch information
joe128 committed Jan 11, 2022
1 parent eb793a6 commit b54b30d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [3.1.2] - 2022-01-11
### Fixed
- Fix check if there were errors during pull of new commits

## [3.1.1] - 2022-01-09
### Fixed
- abort if there were an error during pull of new commits, to prevent an infinite loop
Expand Down
2 changes: 1 addition & 1 deletion anyScript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [ -n "${gitbin}" ] && [ ! -f "$(dirname "$0")/.autoUpdateDisable" ] && [ -z "
echo "[autoUpdate] Found updates ($commits commits)..."
[ $doHardReset -gt 0 ] && $gitbin reset --hard
$gitbin pull --force
if [ ! $? ]; then
if [ $? -eq 0 ]; then
localTip=$(${gitbin} show --abbrev-commit --format=oneline $(${gitbin} rev-list --max-count=1 @{u}) | head -1)
echo "[autoUpdate] source is now at commit '$localTip'"

Expand Down

0 comments on commit b54b30d

Please sign in to comment.