Conditionally restore some "remote/" stuff removed by rP59922b7

Summary: Fixes T4035. I removed these two "remote/" things in rP59922b7, but we need them for non-bare repositories. Without them, the commands work and run fine and the output looks OK, but the results may not reflect the correct information (e.g., the log shows the working copy's master, which may not be in the same state as origin/master). I'm going to generally clean this up, but unbreak it for now.

Test Plan: Viewed bare and non-bare repositories in Diffusion, got accurate history.

Reviewers: btrahan, hach-que

Reviewed By: btrahan

CC: aran, mbishopim3

Maniphest Tasks: T4035

Differential Revision: https://secure.phabricator.com/D7445

src/applications/diffusion/query/stablecommitname/DiffusionGitStableCommitNameQuery.php

@@ -6,9 +6,17 @@ extends DiffusionStableCommitNameQuery {
   protected function executeQuery() {
     $repository = $this->getRepository();
     $branch = $this->getBranch();
-    list($stdout) = $repository->execxLocalCommand(
+
-      'rev-parse --verify %s',
+    if ($repository->isWorkingCopyBare()) {
-      $branch);
+      list($stdout) = $repository->execxLocalCommand(
+        'rev-parse --verify %s',
+        $branch);
+    } else {
+      list($stdout) = $repository->execxLocalCommand(
+        'rev-parse --verify %s/%s',
+        DiffusionBranchInformation::DEFAULT_GIT_REMOTE,
+        $branch);
+    }
 
     $commit = trim($stdout);
     return substr($commit, 0, 16);

src/applications/diffusion/request/DiffusionGitRequest.php

@@ -31,7 +31,13 @@ final class DiffusionGitRequest extends DiffusionRequest {
     if ($this->commit) {
       return $this->commit;
     }
-    return $this->getBranch();
+
+    if ($this->repository->isWorkingCopyBare()) {
+      return $this->getBranch();
+    } else {
+      $remote = DiffusionBranchInformation::DEFAULT_GIT_REMOTE;
+      return $remote.'/'.$this->getBranch();
+    }
   }
 
 }