summaryrefslogtreecommitdiff
path: root/tools/changelog.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tools/changelog.sh')
-rwxr-xr-xtools/changelog.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/changelog.sh b/tools/changelog.sh
index 86774a7ea..49532a4a4 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -395,12 +395,12 @@ function main {
# Get the first version name:
# 1) try tag-like version, or
- # 2) try name-rev, or
- # 3) try branch name, or
+ # 2) try branch name, or
+ # 3) try name-rev, or
# 4) try short hash
version=$(command git describe --tags $until 2>/dev/null) \
- || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" $until 2>/dev/null) \
|| version=$(command git symbolic-ref --quiet --short $until 2>/dev/null) \
+ || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" $until 2>/dev/null) \
|| version=$(command git rev-parse --short $until 2>/dev/null)
# Get commit list from $until commit until $since commit, or until root commit if $since is unset