diff --git a/src/applications/repository/worker/commitmessageparser/git/PhabricatorRepositoryGitCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/git/PhabricatorRepositoryGitCommitMessageParserWorker.php
index 2989452786..89cec4fc84 100644
--- a/src/applications/repository/worker/commitmessageparser/git/PhabricatorRepositoryGitCommitMessageParserWorker.php
+++ b/src/applications/repository/worker/commitmessageparser/git/PhabricatorRepositoryGitCommitMessageParserWorker.php
@@ -1,53 +1,55 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 class PhabricatorRepositoryGitCommitMessageParserWorker
   extends PhabricatorRepositoryCommitMessageParserWorker {
 
   public function parseCommit(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
 
     $local_path = $repository->getDetail('local-path');
 
+    // NOTE: %B was introduced somewhat recently in git's history, so pull
+    // commit message information with %s and %b instead.
     list($info) = execx(
-      '(cd %s && git log -n 1 --pretty=format:%%an%%x00%%B %s)',
+      '(cd %s && git log -n 1 --pretty=format:%%an%%x00%%s%%n%%n%%b %s)',
       $local_path,
       $commit->getCommitIdentifier());
 
-
     list($author, $message) = explode("\0", $info);
 
     // Make sure these are valid UTF-8.
     $author = phutil_utf8ize($author);
     $message = phutil_utf8ize($message);
+    $message = trim($message);
 
     $this->updateCommitData($author, $message);
 
     if ($this->shouldQueueFollowupTasks()) {
       $task = new PhabricatorWorkerTask();
       $task->setTaskClass('PhabricatorRepositoryGitCommitChangeParserWorker');
       $task->setData(
         array(
           'commitID' => $commit->getID(),
         ));
       $task->save();
     }
   }
 
 }