From b5c7896b10ae60fb08eb1dcdbd2ad8fea81ba5bd Mon Sep 17 00:00:00 2001
From: Nick Harper <nharper@fb.com>
Date: Wed, 21 Nov 2012 13:48:27 -0800
Subject: [PATCH] Fix diffusion browse queries in git

Summary:
If you try to load a directory in diffusion in a git repo that has a readme
file and you don't include a trailing slash in the path, you get an error
because we don't assemble the full paths of files correctly. This fixes that.

Test Plan: load such a directory in diffusion and see no fatal

Reviewers: epriestley, vrana

Reviewed By: vrana

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3533
---
 .../diffusion/query/browse/DiffusionGitBrowseQuery.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/query/browse/DiffusionGitBrowseQuery.php b/src/applications/diffusion/query/browse/DiffusionGitBrowseQuery.php
index 1b81181b7e..28fab2d3a0 100644
--- a/src/applications/diffusion/query/browse/DiffusionGitBrowseQuery.php
+++ b/src/applications/diffusion/query/browse/DiffusionGitBrowseQuery.php
@@ -83,7 +83,7 @@ final class DiffusionGitBrowseQuery extends DiffusionBrowseQuery {
         }
       }
 
-      $result->setFullPath($path.$name);
+      $result->setFullPath(rtrim($path, '/').'/'.$name);
       $result->setPath($name);
       $result->setHash($hash);
       $result->setFileType($file_type);