From 8630b6c6f5bed9185101b3a1d2ffc5f7847f3196 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 27 2017 11:45:55 +0000
Subject: If the walker found no commit, do not add None to the list of commits


---

diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py
index 66e67c2..0a3bca2 100644
--- a/pagure/internal/__init__.py
+++ b/pagure/internal/__init__.py
@@ -314,7 +314,9 @@ def get_pull_request_ready_branch():
                     tmp = set(branch_commits)
                 if main_commits.intersection(tmp):
                     break
-                branch_commits.append(branch_commit.hex)
+
+                if branch_commit:
+                    branch_commits.append(branch_commit.hex)
 
             # If master is ahead of branch, we need to remove the commits
             # that are already in master
diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 702119a..e177772 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -1395,7 +1395,8 @@ def diff_pull_request(
             if main_commits.intersection(branch_commits):
                 break
 
-            diff_commits.append(branch_commit)
+            if branch_commit:
+                diff_commits.append(branch_commit)
 
         # If master is ahead of branch, we need to remove the commits
         # that are already in master
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index e8923fc..95b516e 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -114,7 +114,8 @@ def _get_pr_info(repo_obj, orig_repo, branch_from, branch_to):
             if main_commits.intersection(branch_commits):
                 break
 
-            diff_commits.append(branch_commit)
+            if branch_commit:
+                diff_commits.append(branch_commit)
 
         # If master is ahead of branch, we need to remove the commits
         # that are already in master