diff --git a/src/applications/repository/daemon/commitdiscovery/git/__tests__/PhabricatorRepositoryGitCommitDiscoveryDaemonTestCase.php b/src/applications/repository/daemon/commitdiscovery/git/__tests__/PhabricatorRepositoryGitCommitDiscoveryDaemonTestCase.php
index 8ba7af1d1b..1bef77e5c1 100644
--- a/src/applications/repository/daemon/commitdiscovery/git/__tests__/PhabricatorRepositoryGitCommitDiscoveryDaemonTestCase.php
+++ b/src/applications/repository/daemon/commitdiscovery/git/__tests__/PhabricatorRepositoryGitCommitDiscoveryDaemonTestCase.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,6 +75,18 @@ final class PhabricatorRepositoryGitCommitDiscoveryDaemonTestCase
         true,
         'Optional trailing slash should not prevent matches.',
       ),
+      array(
+        'file:///path/to/local/repo.git',
+        'file:///path/to/local/repo.git',
+        true,
+        'file:// protocol should be supported.',
+      ),
+      array(
+        '/path/to/local/repo.git',
+        'file:///path/to/local/repo.git',
+        true,
+        'Implicit file:// protocol should be recognized.',
+      ),
     );
 
     foreach ($cases as $case) {
diff --git a/src/applications/repository/storage/repository/PhabricatorRepository.php b/src/applications/repository/storage/repository/PhabricatorRepository.php
index adf2fb1ade..85017c7cf8 100644
--- a/src/applications/repository/storage/repository/PhabricatorRepository.php
+++ b/src/applications/repository/storage/repository/PhabricatorRepository.php
@@ -74,14 +74,22 @@ class PhabricatorRepository extends PhabricatorRepositoryDAO {
   }
 
   public static function newPhutilURIFromGitURI($raw_uri) {
-    // If there's no protocol (git implicit SSH) reformat the URI to be a
-    // normal URI. These git URIs look like "user@domain.com:path" instead of
-    // "ssh://user@domain/path".
-
     $uri = new PhutilURI($raw_uri);
     if (!$uri->getProtocol()) {
-      list($domain, $path) = explode(':', $raw_uri, 2);
-      $uri = new PhutilURI('ssh://'.$domain.'/'.$path);
+      if (strpos($raw_uri, '/') === 0) {
+        // If the URI starts with a '/', it's an implicit file:// URI on the
+        // local disk.
+        $uri = new PhutilURI('file://'.$raw_uri);
+      } else if (strpos($raw_uri, ':') !== false) {
+        // If there's no protocol (git implicit SSH) but the URI has a colon,
+        // it's a git implicit SSH URI. Reformat the URI to be a normal URI.
+        // These git URIs look like "user@domain.com:path" instead of
+        // "ssh://user@domain/path".
+        list($domain, $path) = explode(':', $raw_uri, 2);
+        $uri = new PhutilURI('ssh://'.$domain.'/'.$path);
+      } else {
+        throw new Exception("The Git URI '{$raw_uri}' could not be parsed.");
+      }
     }
 
     return $uri;
diff --git a/src/applications/repository/storage/repository/__tests__/PhabricatorRepositoryTestCase.php b/src/applications/repository/storage/repository/__tests__/PhabricatorRepositoryTestCase.php
index 7af6246422..eb5d178d26 100644
--- a/src/applications/repository/storage/repository/__tests__/PhabricatorRepositoryTestCase.php
+++ b/src/applications/repository/storage/repository/__tests__/PhabricatorRepositoryTestCase.php
@@ -23,6 +23,7 @@ final class PhabricatorRepositoryTestCase
     static $map = array(
       'ssh://user@domain.com/path.git'  => 'ssh://user@domain.com/path.git',
       'user@domain.com:path.git'        => 'ssh://user@domain.com/path.git',
+      '/path/to/local/repo.git'         => 'file:///path/to/local/repo.git',
     );
 
     foreach ($map as $raw => $expect) {
@@ -34,6 +35,25 @@ final class PhabricatorRepositoryTestCase
     }
   }
 
+  public function testParseBadGitURI() {
+    $junk = array(
+      'herp derp moon balloon',
+    );
+
+    foreach ($junk as $garbage) {
+      $ex = null;
+      try {
+        $uri = PhabricatorRepository::newPhutilURIFromGitURI($garbage);
+      } catch (Exception $caught) {
+        $ex = $caught;
+      }
+      $this->assertEqual(
+        true,
+        (bool)$ex,
+        'Expect exception when parsing garbage.');
+    }
+  }
+
   public function testBranchFilter() {
     $git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;