Merge lp:~cjwatson/launchpad/fix-github-blob-dot-git into lp:launchpad

[Colin Watson]

Fix handling of trailing ".git" when fetching blobs from GitHub.

[Tom Wardill (twom)]

review: Approve

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/code/model/gitref.py'
--- lib/lp/code/model/gitref.py	2018-11-09 22:06:43 +0000
+++ lib/lp/code/model/gitref.py	2018-12-18 18:00:51 +0000
@@ -686,7 +686,7 @@
 def _fetch_blob_from_github(repository_url, ref_path, filename):
     repo_path = urlsplit(repository_url).path.strip("/")
     if repo_path.endswith(".git"):
-        repo_path = repo_path[:len(".git")]
+        repo_path = repo_path[:-len(".git")]
     try:
         response = urlfetch(
             "https://raw.githubusercontent.com/%s/%s/%s" % (
 
=== modified file 'lib/lp/code/model/tests/test_gitref.py'
--- lib/lp/code/model/tests/test_gitref.py	2018-11-09 22:06:43 +0000
+++ lib/lp/code/model/tests/test_gitref.py	2018-12-18 18:00:51 +0000
@@ -421,6 +421,16 @@
         self.assertEqual(b"foo", ref.getBlob("dir/file"))
 
     @responses.activate
+    def test_remote_github_trailing_dot_git(self):
+        ref = self.factory.makeGitRefRemote(
+            repository_url="https://github.com/owner/name.git", path="HEAD")
+        responses.add(
+            "GET",
+            "https://raw.githubusercontent.com/owner/name/HEAD/dir/file",
+            body=b"foo")
+        self.assertEqual(b"foo", ref.getBlob("dir/file"))
+
+    @responses.activate
     def test_remote_github_404(self):
         ref = self.factory.makeGitRefRemote(
             repository_url="https://github.com/owner/name", path="HEAD")