]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Announce: adjust to possible change to the top-level RelNotes
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 23:27:48 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 23:27:48 +0000 (15:27 -0800)
Announce

index 58336565564702080388682624299b75c14ab019..0124eb348a3d1925251d7e503e667c125c3a3e95 100755 (executable)
--- 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/^=============/&========/'
        ;;