diff --git a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
index 68613e5cca..3ddb9a9a16 100644
--- a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
+++ b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
@@ -269,6 +269,16 @@ final class PhabricatorRepositoryPullLocalDaemon
       $target);
 
     if (!$commit) {
+      $callsign = $repository->getCallsign();
+
+      $console = PhutilConsole::getConsole();
+      $console->writeErr(
+        "WARNING: Repository '%s' is missing commits ('%s' is missing from ".
+        "history). Run '%s' to repair the repository.\n",
+        $callsign,
+        $target,
+        "bin/repository discover --repair {$callsign}");
+
       return false;
     }
 
@@ -308,15 +318,25 @@ final class PhabricatorRepositoryPullLocalDaemon
   private function recordCommit(
     PhabricatorRepository $repository,
     $commit_identifier,
-    $epoch) {
+    $epoch,
+    $branch = null) {
 
     $commit = new PhabricatorRepositoryCommit();
     $commit->setRepositoryID($repository->getID());
     $commit->setCommitIdentifier($commit_identifier);
     $commit->setEpoch($epoch);
 
+    $data = new PhabricatorRepositoryCommitData();
+    if ($branch) {
+      $data->setCommitDetail('seenOnBranches', array($branch));
+    }
+
     try {
-      $commit->save();
+      $commit->openTransaction();
+        $commit->save();
+        $data->setCommitID($commit->getID());
+        $data->save();
+      $commit->saveTransaction();
 
       $event = new PhabricatorTimelineEvent(
         'cmit',
@@ -344,11 +364,12 @@ final class PhabricatorRepositoryPullLocalDaemon
       if ($this->repair) {
         // Normally, the query should throw a duplicate key exception. If we
         // reach this in repair mode, we've actually performed a repair.
-        $this->log("Repaired commit '%s'.", $commit_identifier);
+        $this->log("Repaired commit '{$commit_identifier}'.");
       }
 
       $this->setCache($repository, $commit_identifier);
     } catch (AphrontQueryDuplicateKeyException $ex) {
+      $commit->killTransaction();
       // Ignore. This can happen because we discover the same new commit
       // more than once when looking at history, or because of races or
       // data inconsistency or cosmic radiation; in any case, we're still
@@ -577,7 +598,7 @@ final class PhabricatorRepositoryPullLocalDaemon
       }
 
       $this->log("Looking for new commits.");
-      $this->executeGitDiscoverCommit($repository, $commit);
+      $this->executeGitDiscoverCommit($repository, $commit, $name, false);
     }
 
     if (!$tracked_something) {
@@ -608,7 +629,7 @@ final class PhabricatorRepositoryPullLocalDaemon
       }
 
       $this->log("Looking for new autoclose commits.");
-      $this->executeGitDiscoverCommit($repository, $commit, $name);
+      $this->executeGitDiscoverCommit($repository, $commit, $name, true);
     }
   }
 
@@ -619,7 +640,8 @@ final class PhabricatorRepositoryPullLocalDaemon
   private function executeGitDiscoverCommit(
     PhabricatorRepository $repository,
     $commit,
-    $branch = null) {
+    $branch,
+    $autoclose) {
 
     $discover = array($commit);
     $insert = array($commit);
@@ -640,7 +662,7 @@ final class PhabricatorRepositoryPullLocalDaemon
           continue;
         }
         $seen_parent[$parent] = true;
-        if ($branch !== null) {
+        if ($autoclose) {
           $known = $this->isKnownCommitOnAnyAutocloseBranch(
             $repository,
             $parent);
@@ -659,10 +681,10 @@ final class PhabricatorRepositoryPullLocalDaemon
     }
 
     $n = count($insert);
-    if ($branch !== null) {
+    if ($autoclose) {
       $this->log("Found {$n} new autoclose commits on branch '{$branch}'.");
     } else {
-      $this->log("Found {$n} new commits.");
+      $this->log("Found {$n} new commits on branch '{$branch}'.");
     }
 
     while (true) {
@@ -670,10 +692,10 @@ final class PhabricatorRepositoryPullLocalDaemon
       $epoch = $stream->getCommitDate($target);
       $epoch = trim($epoch);
 
-      if ($branch !== null) {
+      if ($autoclose) {
         $this->updateCommit($repository, $target, $branch);
       } else {
-        $this->recordCommit($repository, $target, $epoch);
+        $this->recordCommit($repository, $target, $epoch, $branch);
       }
 
       if (empty($insert)) {