From ce843969cda812ad5f64dbecf4ea26e5f90019c4 Mon Sep 17 00:00:00 2001
From: Kasper Nilsson <kaspern@google.com>
Date: Wed, 25 Jan 2017 14:21:44 -0800
Subject: [PATCH] Prevent 'merged as sadface'

Fixes an assumption that current_revision will always be populated in
the change object. Now, the 'Merged as $SHA' text will only appear if
the change status is 'Merged' AND the current_revision SHA exists.

Bug: Issue 5337
Change-Id: Iacde8b340d32d26d27a7ed9601d9fe679fba2df9
---
 .../elements/change/gr-change-view/gr-change-view.html | 10 ++++++----
 .../elements/change/gr-change-view/gr-change-view.js   |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
index 18dfdc0d97..873acddc2a 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
@@ -255,12 +255,14 @@ limitations under the License.
           <a href$="[[_computeChangePermalink(_change._number)]]">[[_change._number]]</a><!--
        --><template is="dom-if" if="[[_changeStatus]]">
             ([[_changeStatus]]<!--
-         --><template is="dom-if" if="[[_computeShowCommitInfo(_changeStatus)]]">
+         --><template
+                is="dom-if"
+                if="[[_computeShowCommitInfo(_changeStatus, _change.current_revision)]]">
               as
               <gr-commit-info
-                change="[[_change]]"
-                commit-info="[[_computeMergedCommitInfo(_change.current_revision, _change.revisions)]]"
-                server-config="[[serverConfig]]"></gr-commit-info><!--
+                  change="[[_change]]"
+                  commit-info="[[_computeMergedCommitInfo(_change.current_revision, _change.revisions)]]"
+                  server-config="[[serverConfig]]"></gr-commit-info><!--
          --></template><!--
        -->)<!--
      --></template><!--
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index d66917c954..9c7ce99dab 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -563,8 +563,8 @@
       return statusString || '';
     },
 
-    _computeShowCommitInfo: function(changeStatus) {
-      return changeStatus === 'Merged';
+    _computeShowCommitInfo: function(changeStatus, current_revision) {
+      return changeStatus === 'Merged' && current_revision;
     },
 
     _computeMergedCommitInfo: function(current_revision, revisions) {