diff --git a/src/applications/diffusion/request/base/DiffusionRequest.php b/src/applications/diffusion/request/base/DiffusionRequest.php
index a9f2e5cbb9..e179c38d12 100644
--- a/src/applications/diffusion/request/base/DiffusionRequest.php
+++ b/src/applications/diffusion/request/base/DiffusionRequest.php
@@ -418,7 +418,7 @@ abstract class DiffusionRequest {
         // This isn't a real URI per se, it's passed as a query parameter to
         // the ajax changeset stuff but then we parse it back out as though
         // it came from a URI.
-        $uri = "{$path}{$commit}";
+        $uri = rawurldecode("{$path}{$commit}");
         break;
       case 'commit':
         $commit = ltrim($commit, ';');
diff --git a/src/applications/repository/worker/commitchangeparser/git/PhabricatorRepositoryGitCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/git/PhabricatorRepositoryGitCommitChangeParserWorker.php
index 6ddbb67223..7943ff5559 100644
--- a/src/applications/repository/worker/commitchangeparser/git/PhabricatorRepositoryGitCommitChangeParserWorker.php
+++ b/src/applications/repository/worker/commitchangeparser/git/PhabricatorRepositoryGitCommitChangeParserWorker.php
@@ -73,7 +73,7 @@ final class PhabricatorRepositoryGitCommitChangeParserWorker
       }
       list($old_mode, $new_mode,
            $old_hash, $new_hash,
-           $more_stuff) = preg_split('/ +/', $line);
+           $more_stuff) = preg_split('/ +/', $line, 5);
 
       // We may only have two pieces here.
       list($action, $src_path, $dst_path) = array_merge(