Follow first parent on merge commits

sebastinas · sebastinas · commit 7702ebd0a632 · 2021-11-09T17:09:31.000+01:00
If a bugfix release is merged into main, git describe might use the
release tag instead of the X-dev tag. During development, we always want
it to use the X-dev tag, however.
diff --git a/setup.py b/setup.py
@@ -78,7 +78,7 @@ def git_describe_to_python_version(version):
 try:
     # get version from git describe
     proc = subprocess.Popen(
-        ["git", "describe", "--tags"],
+        ["git", "describe", "--tags", "--first-parent"],
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
     )

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ def git_describe_to_python_version(version):`
`78`	`78`	`try:`
`79`	`79`	`# get version from git describe`
`80`	`80`	`proc = subprocess.Popen(`
`81`		`- ["git", "describe", "--tags"],`
	`81`	`+ ["git", "describe", "--tags", "--first-parent"],`
`82`	`82`	`stdout=subprocess.PIPE,`
`83`	`83`	`stderr=subprocess.PIPE,`
`84`	`84`	`)`