tag-git: allow upstream merges

It is true that regular Git for Windows releases always rebase to the
corresponding upstream version.

However, embargoed MinGit releases _merge_ the upstream versions
instead, for simplicity.

And the plan is to do the same for embargoed Git for Windows releases,
too, as that will make future rebases much easier: if embargoed upstream
versions are merged into embargoed Git for Windows releases, those
latter can easily be merged into Git for Windows' `main` branch without
duplicating patches in `main^{/Start.the.merging-rebase}..main`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

update-scripts/tag-git.sh

@@ -43,7 +43,7 @@ else
 		die "Need 'w3m' to render release notes"
 	fi
 
-	desc="$(git --git-dir "$git_git_dir" describe --match 'v[0-9]*[0-9]' --exclude='*-[0-9]*' --first-parent "$git_rev")" &&
+	desc="$(git --git-dir "$git_git_dir" describe --match 'v[0-9]*[0-9]' --exclude='*-[0-9]*' --exclude='*.windows.*' "$git_rev")" &&
 	base_tag=${desc%%-[1-9]*} &&
 	case "$base_tag" in
 	"$desc") die "Revision '$git_rev' already tagged as $base_tag";;