pq-rpm: unbreak patch generation if end point is a tree object

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 9572790e1d8a3269646f25cb5f7c7b0f88e4d6e9..09d332e522b92b1adb13f2e8169b2b318556e7a4 100755 (executable)
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -85,12 +85,12 @@ def generate_patches(repo, start, squash, end, outdir, options):
             raise GbpError('Invalid treeish object %s' % treeish)
 
     start_sha1 = repo.rev_parse("%s^0" % start)
-    try:
-        end_commit = end
-    except GitRepositoryError:
-        # In case of plain tree-ish objects, assume current branch head is the
-        # last commit
+    # In case of plain tree-ish objects, assume current branch head is the
+    # last commit
+    if repo.get_obj_type(end) == 'tree':
         end_commit = "HEAD"
+    else:
+        end_commit = end
     end_commit_sha1 = repo.rev_parse("%s^0" % end_commit)
 
     start_sha1 = repo.rev_parse("%s^0" % start)