Merge pull request #1558 from atom/tt-18-jun-co-authors-bug

Fix uncaught exception when undoing coauthored commit
atom · Jun 29, 2018 · 380a503 · 380a503
2 parents 6b2b700 + 64da7da
commit 380a503
Show file tree

Hide file tree

Showing 4 changed files with 1,740 additions and 1,692 deletions.
diff --git a/lib/controllers/git-tab-controller.js b/lib/controllers/git-tab-controller.js
@@ -3,6 +3,7 @@ import path from 'path';
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import Author from '../models/author';
 import GitTabView from '../views/git-tab-view';
 import UserStore from '../models/user-store';
 import {
@@ -268,7 +269,11 @@ export default class GitTabController extends React.Component {
     const lastCommit = await repo.getLastCommit();
     if (lastCommit.isUnbornRef()) { return null; }
     repo.setCommitMessage(lastCommit.getFullMessage());
-    this.updateSelectedCoAuthors(lastCommit.getCoAuthors());
+
+    const coAuthors = lastCommit.getCoAuthors().map(author =>
+      new Author(author.email, author.name));
+
+    this.updateSelectedCoAuthors(coAuthors);
     return repo.undoLastCommit();
   }