diff --git a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
index 4290a7f6b5..e2c56bb0f8 100644
--- a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
@@ -1,129 +1,129 @@
 <?php
 
 final class DiffusionSearchQueryConduitAPIMethod
   extends DiffusionQueryConduitAPIMethod {
 
   public function getAPIMethodName() {
     return 'diffusion.searchquery';
   }
 
   public function getMethodDescription() {
     return pht('Search (grep) a repository at a specific path and commit.');
   }
 
   protected function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'path' => 'required string',
       'commit' => 'optional string',
       'grep' => 'required string',
       'limit' => 'optional int',
       'offset' => 'optional int',
     );
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     try {
       $results = parent::getResult($request);
     } catch (CommandException $ex) {
       $err = $ex->getError();
 
       if ($err === 1) {
         // `git grep` and `hg grep` exit with 1 if there are no matches;
         // assume we just didn't get any hits.
         return array();
       }
 
       throw $ex;
     }
 
     $offset = $request->getValue('offset');
     $results = array_slice($results, $offset);
 
     return $results;
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $path = $drequest->getPath();
     $grep = $request->getValue('grep');
     $repository = $drequest->getRepository();
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
+    // Starting with Git 2.16.0, Git assumes passing an empty argument is
+    // an error and recommends you pass "." instead.
+    if (!strlen($path)) {
+      $path = '.';
+    }
+
     $results = array();
     $future = $repository->getLocalCommandFuture(
       // NOTE: --perl-regexp is available only with libpcre compiled in.
       'grep --extended-regexp --null -n --no-color -f - %s -- %s',
       $drequest->getStableCommit(),
       $path);
 
     // NOTE: We're writing the pattern on stdin to avoid issues with UTF8
     // being mangled by the shell. See T12807.
     $future->write($grep);
 
     $binary_pattern = '/Binary file [^:]*:(.+) matches/';
     $lines = new LinesOfALargeExecFuture($future);
 
     foreach ($lines as $line) {
       $result = null;
       if (preg_match('/[^:]*:(.+)\0(.+)\0(.*)/', $line, $result)) {
         $results[] = array_slice($result, 1);
       } else if (preg_match($binary_pattern, $line, $result)) {
         list(, $path) = $result;
         $results[] = array($path, null, pht('Binary file'));
       } else {
         $results[] = array(null, null, $line);
       }
       if (count($results) >= $offset + $limit) {
         break;
       }
     }
     unset($lines);
 
     return $results;
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $path = $drequest->getPath();
     $grep = $request->getValue('grep');
     $repository = $drequest->getRepository();
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
-    // Starting with Git 2.16.0, Git assumes passing an empty argument is
-    // an error and recommends you pass "." instead.
-    if (!strlen($path)) {
-      $path = '.';
-    }
-
     $results = array();
     $future = $repository->getLocalCommandFuture(
       'grep --rev %s --print0 --line-number -- %s %s',
       hgsprintf('ancestors(%s)', $drequest->getStableCommit()),
       $grep,
       $path);
 
     $lines = id(new LinesOfALargeExecFuture($future))->setDelimiter("\0");
     $parts = array();
     foreach ($lines as $line) {
       $parts[] = $line;
       if (count($parts) == 4) {
         list($path, $char_offset, $line, $string) = $parts;
         $results[] = array($path, $line, $string);
         if (count($results) >= $offset + $limit) {
           break;
         }
         $parts = array();
       }
     }
     unset($lines);
 
     return $results;
   }
 
 }