pre-push: before pushing tags, need to be up to date with main

Since the same push might include not only the tag, but also the local `main` branch, and since the `pre-push` hook gets no information from Git _what_ is about to be pushed, the best we can do about `origin/main` is to _only_ warn if it is not up to date with the tag. Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows · Jan 14, 2022 · 3e92f6b · 3e92f6b
1 parent 3049866
commit 3e92f6b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pre-push.hook b/pre-push.hook
@@ -23,6 +23,10 @@ do
     out="$(git tag --verify $tag 2>&1)" ||
     die "$out$LF${LF}Tag $tag is not signed/signature cannot be verified"
 
+    test 0 = $(git rev-list --count ...main) || die 'HEAD is not up to date with `main`'
+    test 0 = $(git rev-list --count ...origin/main) ||
+    echo 'warning: HEAD is not up to date with `origin/main`' >&2
+
     regex="^  \"version\": \"$(echo "${tag#v}" | sed 's/\./\\./g')\",\$"
     substitute="s/^\\(  \"version\": \"\\).*\",\$/\\1${tag#v}\",/"
     git grep -q "$regex" refs/tags/$tag -- package.json || {