aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenjiro Nakayama <nakayamakenjiro@gmail.com>2026-08-12 08:57:45 +0900
committerKenjiro Nakayama <nakayamakenjiro@gmail.com>2026-08-12 09:10:29 +0900
commit2677aab92004fd799305093381eaf181ff8b7cd2 (patch)
tree0550c740fd6c9467198470e0e9cdbb0ef7b271e4
parent2aaf4dbee62926f4b3149d2fd6e2d40b2f6e1dd0 (diff)
downloadportable-2677aab92004fd799305093381eaf181ff8b7cd2.tar.gz
portable-2677aab92004fd799305093381eaf181ff8b7cd2.tar.bz2
portable-2677aab92004fd799305093381eaf181ff8b7cd2.zip
update.sh: do not ignore git failures
git describe is expected to fail when HEAD is not exactly at a tag. However, the set +e used for this check also allowed fetch, checkout, and pull failures to be ignored, causing less useful missing-file errors later in the script. Re-enable set -e immediately after recording the git describe result so that subsequent Git operations fail at the actual error.
-rwxr-xr-xupdate.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/update.sh b/update.sh
index b863d4a..ddd2cf3 100755
--- a/update.sh
+++ b/update.sh
@@ -30,6 +30,7 @@ fi
30set +e 30set +e
31tag=`git describe --exact-match --tags HEAD 2>/dev/null` 31tag=`git describe --exact-match --tags HEAD 2>/dev/null`
32is_tag=$? 32is_tag=$?
33set -e
33# adjust for 9 hour time delta between trees 34# adjust for 9 hour time delta between trees
34release_ts=$((`git show -s --format=%ct $tag|tail -1` + 32400)) 35release_ts=$((`git show -s --format=%ct $tag|tail -1` + 32400))
35commit=`git -C openbsd rev-list -n 1 --before=$release_ts origin/$openbsd_branch` 36commit=`git -C openbsd rev-list -n 1 --before=$release_ts origin/$openbsd_branch`
@@ -45,7 +46,6 @@ else
45 git -C openbsd checkout $openbsd_branch 46 git -C openbsd checkout $openbsd_branch
46 git -C openbsd pull 47 git -C openbsd pull
47fi 48fi
48set -e
49 49
50# setup source paths 50# setup source paths
51CWD=`pwd` 51CWD=`pwd`