Handle repositories with no commits

lib/controllers/git-tab-controller.js

@@ -98,7 +98,7 @@ export default class GitTabController {
       lastCommit: repository.getLastCommit(),
       isMerging: repository.isMerging(),
       isRebasing: repository.isRebasing(),
-      branchName: repository.getCurrentBranch(),
+      currentBranch: repository.getCurrentBranch(),
       branches: repository.getBranches(),
       remoteName: repository.getRemoteForBranch(this.branchName),
       unstagedChanges: repository.getUnstagedChanges(),

lib/controllers/github-tab-controller.js

@@ -6,23 +6,23 @@ import RemotePrController from './remote-pr-controller';
 import Repository from '../models/repository';
 import GithubLoginModel from '../models/github-login-model';
 import ObserveModel from '../decorators/observe-model';
-import {RemotePropType} from '../prop-types';
+import {RemotePropType, BranchPropType} from '../prop-types';
 
 class RemoteSelector extends React.Component {
   static propTypes = {
     remotes: React.PropTypes.arrayOf(RemotePropType).isRequired,
-    currentBranch: React.PropTypes.string.isRequired,
+    currentBranchName: React.PropTypes.string.isRequired,
     selectRemote: React.PropTypes.func.isRequired,
   }
 
   render() {
-    const {remotes, currentBranch, selectRemote} = this.props;
+    const {remotes, currentBranchName, selectRemote} = this.props;
     return (
       <div className="github-RemoteSelector">
         <p>
           This repository has multiple remotes hosted at GitHub.com.
           Select a remote to see pull requests associated
-          with the <strong>{currentBranch}</strong> branch.
+          with the <strong>{currentBranchName}</strong> branch.
         </p>
         <ul>
           {remotes.map(remote => (
@@ -55,13 +55,13 @@ export default class GithubTabController extends React.Component {
   static propTypes = {
     repository: React.PropTypes.object,
     remotes: React.PropTypes.arrayOf(RemotePropType.isRequired),
-    currentBranch: React.PropTypes.string,
+    currentBranch: BranchPropType,
     selectedRemote: React.PropTypes.string,
   }
 
   static defaultProps = {
     remotes: null,
-    currentBranch: '',
+    currentBranch: {name: '', isDetached: false},
     selectedRemote: null,
   }
 
@@ -75,6 +75,10 @@ export default class GithubTabController extends React.Component {
       return null;
     }
 
+    if (!this.currentBranch || this.currentBranch.isDetached) {
+      return null;
+    }
+
     let remote = this.props.remotes.find(r => r.name === this.props.selectedRemote);
     let remotesAvailable = false;
     if (!remote && this.props.remotes.length === 1) {
@@ -93,13 +97,13 @@ export default class GithubTabController extends React.Component {
               endpoint="https://api.github.com"
               loginModel={this.loginModel}
               remote={remote}
-              currentBranch={this.props.currentBranch}
+              currentBranchName={this.props.currentBranch.name}
             />
           }
           {!remote && remotesAvailable &&
             <RemoteSelector
               remotes={this.props.remotes}
-              currentBranch={this.props.currentBranch}
+              currentBranchName={this.props.currentBranch.name}
               selectRemote={this.handleRemoteSelect}
             />
           }

lib/controllers/pr-info-controller.js

@@ -53,7 +53,7 @@ export default class PrInfoController extends React.Component {
     endpoint: React.PropTypes.string.isRequired,
     token: React.PropTypes.string.isRequired,
     instance: React.PropTypes.string.isRequired,
-    currentBranch: React.PropTypes.string.isRequired,
+    currentBranchName: React.PropTypes.string.isRequired,
     loginModel: React.PropTypes.object.isRequired,
     onLogin: React.PropTypes.func.isRequired,
     remote: RemotePropType.isRequired,
@@ -65,7 +65,7 @@ export default class PrInfoController extends React.Component {
     const route = new PrInfoRoute({
       repoOwner: this.props.remote.info.owner,
       repoName: this.props.remote.info.name,
-      branchName: this.props.currentBranch,
+      branchName: this.props.currentBranchName,
     });
 
     const environment = getEnvironmentForInstance(instance, endpoint, token);

lib/controllers/remote-pr-controller.js

@@ -22,7 +22,7 @@ export default class RemotePrController extends React.Component {
     endpoint: React.PropTypes.string, // fully qualified URI to the API endpoint, e.g. 'https://api.github.com'
     remote: RemotePropType.isRequired,
     token: React.PropTypes.string,
-    currentBranch: React.PropTypes.string.isRequired,
+    currentBranchName: React.PropTypes.string.isRequired,
   }
 
   static defaultProps = {
@@ -32,11 +32,11 @@ export default class RemotePrController extends React.Component {
   }
 
   render() {
-    const {instance, endpoint, remote, currentBranch, token, loginModel} = this.props;
+    const {instance, endpoint, remote, currentBranchName, token, loginModel} = this.props;
     return (
       <div className="github-RemotePrController">
         {token && <PrInfoController
-          {...{instance, endpoint, remote, currentBranch, token, loginModel}}
+          {...{instance, endpoint, remote, currentBranchName, token, loginModel}}
           onLogin={this.handleLogin}
                   />
           }

lib/controllers/status-bar-tile-controller.js

@@ -1,6 +1,7 @@
 import React from 'react';
 
 import ObserveModel from '../decorators/observe-model';
+import {BranchPropType} from '../prop-types';
 import BranchView from '../views/branch-view';
 import BranchMenuView from '../views/branch-menu-view';
 import PushPullView from '../views/push-pull-view';
@@ -15,7 +16,7 @@ import {autobind} from 'core-decorators';
   getModel: props => props.repository,
   fetchData: repository => {
     return yubikiri({
-      branchName: repository.getCurrentBranch(),
+      currentBranch: repository.getCurrentBranch(),
       branches: repository.getBranches(),
       changedFilesCount: repository.getStatusesForChangedFiles().then(statuses => {
         const {stagedFiles, unstagedFiles, mergeConflictFiles} = statuses;
@@ -33,9 +34,9 @@ import {autobind} from 'core-decorators';
 
         return changedFiles.size;
       }),
-      remoteName: async query => repository.getRemoteForBranch(await query.branchName),
-      aheadCount: async query => repository.getAheadCount(await query.branchName),
-      behindCount: async query => repository.getBehindCount(await query.branchName),
+      remoteName: async query => repository.getRemoteForBranch((await query.currentBranch).name),
+      aheadCount: async query => repository.getAheadCount((await query.currentBranch).name),
+      behindCount: async query => repository.getBehindCount((await query.currentBranch).name),
       pullDisabled: async query => (await query.changedFilesCount) > 0,
     });
   },
@@ -47,7 +48,7 @@ export default class StatusBarTileController extends React.Component {
     commandRegistry: React.PropTypes.object.isRequired,
     tooltips: React.PropTypes.object.isRequired,
     repository: React.PropTypes.object,
-    branchName: React.PropTypes.string,
+    currentBranch: BranchPropType,
     branches: React.PropTypes.arrayOf(React.PropTypes.string),
     remoteName: React.PropTypes.string,
     aheadCount: React.PropTypes.number,
@@ -73,7 +74,7 @@ export default class StatusBarTileController extends React.Component {
 
   render() {
     const repoProps = {
-      branchName: this.props.branchName,
+      currentBranch: this.props.currentBranch || {name: '', isDetached: false},
       branches: this.props.branches,
       remoteName: this.props.remoteName,
       aheadCount: this.props.aheadCount,
@@ -179,7 +180,9 @@ export default class StatusBarTileController extends React.Component {
 
   @autobind
   async push(options) {
-    await this.setInProgressWhile(() => this.props.repository.push(this.props.branchName, options), {push: true});
+    await this.setInProgressWhile(() => {
+      return this.props.repository.push(this.props.currentBranch.name, options);
+    }, {push: true});
   }
 
   @autobind
@@ -188,11 +191,11 @@ export default class StatusBarTileController extends React.Component {
       return;
     }
 
-    await this.setInProgressWhile(() => this.props.repository.pull(this.props.branchName), {pull: true});
+    await this.setInProgressWhile(() => this.props.repository.pull(this.props.currentBranch.name), {pull: true});
   }
 
   @autobind
   async fetch() {
-    await this.setInProgressWhile(() => this.props.repository.fetch(this.props.branchName), {fetch: true});
+    await this.setInProgressWhile(() => this.props.repository.fetch(this.props.currentBranch.name), {fetch: true});
   }
 }

lib/git-shell-out-strategy.js

@@ -311,11 +311,21 @@ export default class GitShellOutStrategy {
   async getCommit(ref) {
     const output = await this.exec(['log', '--pretty=%H%x00%B%x00', '--no-abbrev-commit', '-1', ref]);
     const [sha, message] = (output).split('\0');
-    return {sha, message: message.trim()};
+    return {sha, message: message.trim(), unbornRef: false};
   }
 
-  getHeadCommit() {
-    return this.getCommit('HEAD');
+  async getHeadCommit() {
+    try {
+      const commit = await this.getCommit('HEAD');
+      commit.unbornRef = false;
+      return commit;
+    } catch (e) {
+      if (/unknown revision/.test(e.stdErr)) {
+        return {sha: '', message: '', unbornRef: true};
+      } else {
+        throw e;
+      }
+    }
   }
 
   readFileFromIndex(filePath) {
@@ -421,8 +431,20 @@ export default class GitShellOutStrategy {
    * Branches
    */
   async getCurrentBranch() {
-    const output = await this.exec(['rev-parse', '--abbrev-ref', 'HEAD']);
-    return output.trim();
+    const content = await readFile(path.join(this.workingDir, '.git', 'HEAD'));
+    if (content.startsWith('ref: ')) {
+      // The common case: you're on a branch
+      return {
+        name: (await this.exec(['symbolic-ref', '--short', 'HEAD'])).trim(),
+        isDetached: false,
+      };
+    } else {
+      // Detached HEAD
+      return {
+        name: (await this.exec(['describe', '--contains', '--all', 'HEAD'])).trim(),
+        isDetached: true,
+      };
+    }
   }
 
   checkout(branchName, options = {}) {
@@ -454,9 +476,8 @@ export default class GitShellOutStrategy {
   }
 
   async getBranches() {
-    const output = await this.exec(['branch']);
-    return output.trim().split(LINE_ENDING_REGEX)
-      .map(branchName => branchName.trim().replace(/^\* /, ''));
+    const output = await this.exec(['for-each-ref', '--format=%(refname:short)', 'refs/heads/*']);
+    return output.trim().split(LINE_ENDING_REGEX);
   }
 
   async getConfig(option, {local} = {}) {

lib/prop-types.js

@@ -19,3 +19,8 @@ export const RemotePropType = PropTypes.shape({
     name: PropTypes.string,
   }).isRequired,
 });
+
+export const BranchPropType = PropTypes.shape({
+  name: PropTypes.string.isRequired,
+  isDetached: PropTypes.bool.isRequired,
+});

lib/views/branch-menu-view.js

@@ -3,19 +3,24 @@ import {autobind} from 'core-decorators';
 
 import Commands, {Command} from './commands';
 import {GitError} from '../git-shell-out-strategy';
+import {BranchPropType} from '../prop-types';
 
 export default class BranchMenuView extends React.Component {
   static propTypes = {
     workspace: React.PropTypes.object.isRequired,
     commandRegistry: React.PropTypes.object.isRequired,
     notificationManager: React.PropTypes.object.isRequired,
     branches: React.PropTypes.arrayOf(React.PropTypes.string),
-    branchName: React.PropTypes.string,
+    currentBranch: BranchPropType,
     checkout: React.PropTypes.func,
   }
 
   static defaultProps = {
     branches: [],
+    currentBranch: {
+      name: '',
+      isDetached: true,
+    },
     checkout: () => Promise.resolve(),
   }
 
@@ -29,7 +34,7 @@ export default class BranchMenuView extends React.Component {
   }
 
   render() {
-    const currentBranch = this.state.checkingOutBranch || this.props.branchName;
+    const currentBranchName = this.state.checkingOutBranch || this.props.currentBranch.name;
     const branches = this.props.branches;
     if (this.state.checkingOutBranch && this.props.branches.indexOf(this.state.checkingOutBranch) === -1) {
       branches.push(this.state.checkingOutBranch);
@@ -53,7 +58,10 @@ export default class BranchMenuView extends React.Component {
       <select
         className="github-BranchMenuView-item github-BranchMenuView-select input-select"
         onChange={this.didSelectItem}
-        value={currentBranch}>
+        value={currentBranchName}>
+        {this.props.currentBranch.isDetached &&
+          <option key="detached" value="detached" disabled>{this.props.currentBranch.name}</option>
+        }
         {branches.map(branch => {
           return <option key={branch} value={branch}>{branch}</option>;
         })}

lib/views/branch-view.js

@@ -1,15 +1,22 @@
 import React from 'react';
+import cx from 'classnames';
+
+import {BranchPropType} from '../prop-types';
 
 export default class BranchView extends React.Component {
   static propTypes = {
-    branchName: React.PropTypes.string,
+    currentBranch: BranchPropType,
   }
 
   render() {
+    const classNames = cx(
+      'github-branch', 'inline-block', {'github-branch-detached': this.props.currentBranch.isDetached},
+    );
+
     return (
-      <div className="github-branch inline-block" ref={e => { this.element = e; }}>
+      <div className={classNames} ref={e => { this.element = e; }}>
         <span className="icon icon-git-branch" />
-        <span className="branch-label">{this.props.branchName}</span>
+        <span className="branch-label">{this.props.currentBranch.name}</span>
       </div>
     );
   }

lib/views/commit-view.js

@@ -47,6 +47,10 @@ export default class CommitView {
     } else if (this.getRemainingCharacters() < this.props.maximumCharacterLimit / 4) {
       remainingCharsClassName = 'is-warning';
     }
+
+    const showAbortMergeButton = this.props.isMerging || null;
+    const showAmendBox = (!this.props.isMerging && !this.props.lastCommit.unbornRef) || null;
+
     return (
       <div className="github-CommitView" ref="CommitView">
         <div className="github-CommitView-editor">
@@ -61,18 +65,21 @@ export default class CommitView {
           />
         </div>
         <footer className="github-CommitView-bar">
-          <button ref="abortMergeButton" className="btn github-CommitView-button is-secondary"
-            onclick={this.abortMerge}
-            style={{display: this.props.isMerging ? '' : 'none'}}>Abort Merge</button>
-          <label className="github-CommitView-label input-label" style={{display: this.props.isMerging ? 'none' : ''}}>
-            <input
-              ref="amend"
-              className="input-checkbox"
-              type="checkbox"
-              onclick={this.handleAmendBoxClick}
-              checked={this.props.isAmending}
-            /> Amend
-          </label>
+          {showAbortMergeButton &&
+            <button ref="abortMergeButton" className="btn github-CommitView-button is-secondary"
+              onclick={this.abortMerge}>Abort Merge</button>
+          }
+          {showAmendBox &&
+            <label className="github-CommitView-label input-label">
+              <input
+                ref="amend"
+                className="input-checkbox"
+                type="checkbox"
+                onclick={this.handleAmendBoxClick}
+                checked={this.props.isAmending}
+              /> Amend
+            </label>
+          }
           <button ref="commitButton" className="btn github-CommitView-button"
             onclick={this.commit}
             disabled={!this.isCommitButtonEnabled()}>{this.commitButtonText()}</button>