From 84f2909531cce32b38ace9fa82d4e47df6a9ac5a Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sat, 27 Jul 2013 15:56:51 -0400
Subject: [PATCH] fix(master_release): Use tag names in commit message when
 available

---
 master_release | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/master_release b/master_release
index 8e7760f5f9..213328669b 100755
--- a/master_release
+++ b/master_release
@@ -23,10 +23,11 @@ repo init -b "${FLAGS_master}"
 
 info "Updating version.txt from ${FLAGS_branch}"
 cd "${GCLIENT_ROOT}/.repo/manifests"
-git fetch --all
+git fetch --all --tags
 git checkout "${FLAGS_branch}" version.txt
 git add version.txt
-git commit -m "bump(version): Update version from ${FLAGS_branch}"
+tag=$(git describe --exact --tags "${FLAGS_branch}" 2>/dev/null || true)
+git commit -m "bump(version): Update version from ${tag:-$FLAGS_branch}"
 
 if [[ ${FLAGS_push} -eq ${FLAGS_TRUE} ]]; then
     info "Pushing to ${FLAGS_remote} ${FLAGS_master}"