* [PATCH] devtools: ignore non merged tags for backport
@ 2017-07-31 12:07 Thomas Monjalon
2017-08-03 10:00 ` Thomas Monjalon
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Monjalon @ 2017-07-31 12:07 UTC (permalink / raw)
To: dev
When checking if a buggy commit was introduced in an old version,
the script compares last tag containing the bug and current version.
The non merged tags from non related branches must be ignored.
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
devtools/git-log-fixes.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
index 740494677..580068741 100755
--- a/devtools/git-log-fixes.sh
+++ b/devtools/git-log-fixes.sh
@@ -66,7 +66,7 @@ range="$*"
# get major release version of a commit
commit_version () # <hash>
{
- tag=$(git tag -l --contains $1 | head -n1)
+ tag=$(git tag -l --contains $1 --merged | head -n1)
if [ -z "$tag" ] ; then
# before -rc1 tag of release in progress
make showversion | cut -d'.' -f-2
--
2.13.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-03 10:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-31 12:07 [PATCH] devtools: ignore non merged tags for backport Thomas Monjalon
2017-08-03 10:00 ` Thomas Monjalon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.