diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-11-08 14:15:11 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-11-08 14:45:54 +0000 |
| commit | 055c52583a2794da8ba1e85a48cce3832372b12f (patch) | |
| tree | 8ceb1cb78fbb46a0f341f8ee24feb3c6b5540013 /devtools/git-log-fixes.sh | |
| parent | f239aed5e674965691846e8ce3f187dd47523689 (diff) | |
New upstream version 17.11-rc3
Change-Id: I6a5baa40612fe0c20f30b5fa773a6cbbac63a685
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'devtools/git-log-fixes.sh')
| -rwxr-xr-x | devtools/git-log-fixes.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 58006874..cd5cf893 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -66,7 +66,16 @@ range="$*" # get major release version of a commit commit_version () # <hash> { - tag=$(git tag -l --contains $1 --merged | head -n1) + # use current branch as history reference + local refbranch=$(git rev-parse --abbrev-ref HEAD) + local tag=$( (git tag -l --contains $1 --merged $refbranch 2>&- || + # tag --merged option has been introduced in git 2.7.0 + # below is a fallback in case of old git version + for t in $(git tag -l --contains $1) ; do + git branch $refbranch --contains $t | + sed "s,.\+,$t," + done) | + head -n1) if [ -z "$tag" ] ; then # before -rc1 tag of release in progress make showversion | cut -d'.' -f-2 |