From d7713b27c188faa1fbb0c5b408829e8c0fd2e7b6 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Thu, 11 Apr 2019 20:26:32 +0200
Subject: [PATCH] Make branch name take place of tag name when not in HEAD.

---
 templates/_layout/footer.twig |  9 ++++++---
 templates/master_minimal.twig | 11 ++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/templates/_layout/footer.twig b/templates/_layout/footer.twig
index 235e33cb..f9c038e7 100644
--- a/templates/_layout/footer.twig
+++ b/templates/_layout/footer.twig
@@ -7,11 +7,14 @@
         <div class="footer__copyright">
             {{ 'https://flash.moe'|html_link('Flashwave', 'footer__link') }} 2013-{{
             ''|date('Y') }} /
-            {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_tag)|html_link(git_tag, 'footer__link') }}
-            # {{ ('https://github.com/flashwave/misuzu/commit/' ~ git_commit_hash(true))|html_link(git_commit_hash(), 'footer__link') }}
+            {% set git_branch = git_branch() %}
             {% if git_branch != 'HEAD' %}
-                ({{ ('https://github.com/flashwave/misuzu/tree/' ~ git_branch)|html_link(git_branch, 'footer__link') }})
+                {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_branch)|html_link(git_branch, 'footer__link') }}
+            {% else %}
+                {% set git_tag = git_tag() %}
+                {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_tag)|html_link(git_tag, 'footer__link') }}
             {% endif %}
+            # {{ ('https://github.com/flashwave/misuzu/commit/' ~ git_commit_hash(true))|html_link(git_commit_hash(), 'footer__link') }}
             {% if constant('MSZ_DEBUG') or current_user.user_id|default(0) == 1 %}
                 / SQL Queries: {{ sql_query_count()|number_format }}
                 / Took: {{ startup_time()|number_format(5) }} seconds
diff --git a/templates/master_minimal.twig b/templates/master_minimal.twig
index 7e87301c..ef5fa476 100644
--- a/templates/master_minimal.twig
+++ b/templates/master_minimal.twig
@@ -37,16 +37,17 @@
             <div class="footer__background"></div>
             <div class="footer__wrapper">
                 {% autoescape false %}
-                {% set git_tag = git_tag() %}
-                {% set git_branch = git_branch() %}
                 <div class="footer__copyright">
                     {{ 'https://flash.moe'|html_link('Flashwave', 'footer__link') }} 2013-{{
                     ''|date('Y') }} /
-                    {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_tag)|html_link(git_tag, 'footer__link') }}
-                    # {{ ('https://github.com/flashwave/misuzu/commit/' ~ git_commit_hash(true))|html_link(git_commit_hash(), 'footer__link') }}
+                    {% set git_branch = git_branch() %}
                     {% if git_branch != 'HEAD' %}
-                        ({{ ('https://github.com/flashwave/misuzu/tree/' ~ git_branch)|html_link(git_branch, 'footer__link') }})
+                        {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_branch)|html_link(git_branch, 'footer__link') }}
+                    {% else %}
+                        {% set git_tag = git_tag() %}
+                        {{ ('https://github.com/flashwave/misuzu/tree/' ~ git_tag)|html_link(git_tag, 'footer__link') }}
                     {% endif %}
+                    # {{ ('https://github.com/flashwave/misuzu/commit/' ~ git_commit_hash(true))|html_link(git_commit_hash(), 'footer__link') }}
                 </div>
                 {% endautoescape %}
             </div>