From 1ff64e4c5d78d4f293675b8745dfb7bbb72f8d65 Mon Sep 17 00:00:00 2001
From: Vivek Anand <vivekanand1101@gmail.com>
Date: Jun 07 2016 13:55:13 +0000
Subject: Correcting links to commits page from any 'commit page' if branch is not master


---

diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html
index c824857..3bc23b7 100644
--- a/pagure/templates/commits.html
+++ b/pagure/templates/commits.html
@@ -110,7 +110,7 @@
       <div class="list-group m-t-1">
         {% for commit in last_commits %}
           <a href="{{ url_for('view_commit', username=username,
-                  repo=repo.name, commitid=commit.hex) }}"
+                  repo=repo.name, commitid=commit.hex, branch=branchname) }}"
               class="list-group-item {%
                 if diff_commits and commit.oid.hex in diff_commits %}p-l-3{%
                 endif %}" style="position:relative;">
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 7979977..13312eb 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -600,6 +600,20 @@ def view_commit(repo, commitid, username=None):
 
     repo_obj = pygit2.Repository(reponame)
 
+    branchname = flask.request.args.get('branch', None)
+
+    if branchname and branchname not in repo_obj.listall_branches():
+        flask.abort(404, 'Branch no found')
+
+    if branchname:
+        branch = repo_obj.lookup_branch(branchname)
+    elif not repo_obj.is_empty and not repo_obj.head_is_unborn:
+        branch = repo_obj.lookup_branch(repo_obj.head.shorthand)
+        branchname = branch.branch_name
+    else:
+        branch = None
+        branchname = None
+
     try:
         commit = repo_obj.get(commitid)
     except ValueError:
@@ -621,6 +635,7 @@ def view_commit(repo, commitid, username=None):
         'commit.html',
         select='commits',
         repo=repo,
+        branchname=branchname,
         username=username,
         repo_admin=is_repo_admin(repo),
         commitid=commitid,