From c20034be31034f135f4e5f0a995ae82c318516c2 Mon Sep 17 00:00:00 2001
From: Lanre Adelowo <adelowomailbox@gmail.com>
Date: Tue, 5 Feb 2019 22:47:01 +0100
Subject: [PATCH] Display the branch name in the commit view (#5950)

* add branch info

* Remove blank lines

* Remove blank lines

* update git dependency
---
 Gopkg.lock                              |  4 ++--
 templates/repo/diff/page.tmpl           |  1 +
 vendor/code.gitea.io/git/commit.go      |  1 +
 vendor/code.gitea.io/git/repo_commit.go | 10 +++++++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index ba21eca95c2a0..0df0cf57d0ccd 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -3,11 +3,11 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:8a6c3c311918c0f08fa2899feae2c938a9bf22b51378e3720d63b80aca4e80aa"
+  digest = "1:537ed734fb4869453583d9ce24d93bf68c88287082778efe55ae749970a1012a"
   name = "code.gitea.io/git"
   packages = ["."]
   pruneopts = "NUT"
-  revision = "d04f81a6f8979be39da165fc034447a805071b97"
+  revision = "fbe468c7a634991285eaa1f93e73431e3edfc471"
 
 [[projects]]
   branch = "master"
diff --git a/templates/repo/diff/page.tmpl b/templates/repo/diff/page.tmpl
index d8489dffb98fa..3f383add948b1 100644
--- a/templates/repo/diff/page.tmpl
+++ b/templates/repo/diff/page.tmpl
@@ -13,6 +13,7 @@
 				{{if IsMultilineCommitMessage .Commit.Message}}
 					<pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
 				{{end}}
+				<span class="text grey"><i class="octicon octicon-git-branch"></i>{{.Commit.Branch}}</span>
 			</div>
 			<div class="ui attached info segment {{if .Commit.Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}">
 				<div class="ui stackable grid">
diff --git a/vendor/code.gitea.io/git/commit.go b/vendor/code.gitea.io/git/commit.go
index 227df09b7d184..36b8d545657e0 100644
--- a/vendor/code.gitea.io/git/commit.go
+++ b/vendor/code.gitea.io/git/commit.go
@@ -18,6 +18,7 @@ import (
 
 // Commit represents a git commit.
 type Commit struct {
+	Branch string // Branch this commit belongs to
 	Tree
 	ID            SHA1 // The ID of this commit object
 	Author        *Signature
diff --git a/vendor/code.gitea.io/git/repo_commit.go b/vendor/code.gitea.io/git/repo_commit.go
index 484568585fe94..bfbf5c6dae200 100644
--- a/vendor/code.gitea.io/git/repo_commit.go
+++ b/vendor/code.gitea.io/git/repo_commit.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mcuadros/go-version"
+	version "github.com/mcuadros/go-version"
 )
 
 // GetRefCommitID returns the last commit ID string of given reference (branch or tag).
@@ -130,6 +130,14 @@ func (repo *Repository) getCommit(id SHA1) (*Commit, error) {
 	commit.repo = repo
 	commit.ID = id
 
+	data, err = NewCommand("name-rev", id.String()).RunInDirBytes(repo.Path)
+	if err != nil {
+		return nil, err
+	}
+
+	// name-rev commitID ouput will be "COMMIT_ID master" or "COMMIT_ID master~12"
+	commit.Branch = strings.Split(strings.Split(string(data), " ")[1], "~")[0]
+
 	repo.commitCache.Set(id.String(), commit)
 	return commit, nil
 }