From ff7d5e2f294181bab85e90090a35868bb68ba18d Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2015 15:27:48 -0800
Subject: [PATCH] Meta/Announce: adjust to possible change to the top-level
 RelNotes

---
 Announce | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Announce b/Announce
index 5833656556..0124eb348a 100755
--- a/Announce
+++ b/Announce
@@ -70,10 +70,17 @@ tag and the '$branch' branch that the tag points at:
 
 EOF
 
-RelNotes=$(git cat-file blob "${branch}:RelNotes") &&
+case "$(git ls-tree ${branch} RelNotes)" in
+120000' '*)
+	RelNotes=$(git cat-file blob "${branch}:RelNotes")
+	;;
+*)
+	RelNotes=RelNotes
+	;;
+esac &&
 git cat-file blob "${branch}:$RelNotes" |
 case "$relname" in
-*-rc[0-9]*)
+*-*)
 	sed -e 's/^Git .* Release Notes$/& (draft)/' \
 	    -e 's/^=============/&========/'
 	;;
-- 
2.11.4.GIT