From d1a014f3078a3088c62d4f6820edd71cf60f25fd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Apr 21 2015 11:33:38 +0000 Subject: Handle the situation where no commits were found different between the two branches --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index f4b0e5a..78df23d 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -135,10 +135,11 @@ def request_pull(repo, requestid, username=None): if commit.oid.hex == request.commit_start: break - diff = repo_obj.diff( - repo_obj.revparse_single(diff_commits[-1].parents[0].oid.hex), - repo_obj.revparse_single(diff_commits[0].oid.hex) - ) + if diff_commits: + diff = repo_obj.diff( + repo_obj.revparse_single(diff_commits[-1].parents[0].oid.hex), + repo_obj.revparse_single(diff_commits[0].oid.hex) + ) else: branch = repo_obj.lookup_branch(request.branch_from) commitid = branch.get_object().hex @@ -156,7 +157,7 @@ def request_pull(repo, requestid, username=None): break diff_commits.append(commit) - if request.status: + if request.status and diff_commits: first_commit = repo_obj[diff_commits[-1].oid.hex] request.commit_start = first_commit.oid.hex request.commit_stop = diff_commits[0].oid.hex