followup #450: fixes behavior when "disableBranchWithChanges": true

Author: telamonian

src/components/BranchHeader.tsx

@@ -19,6 +19,9 @@ import {
 import { Git, IGitExtension } from '../tokens';
 import { NewBranchBox } from './NewBranchBox';
 
+const CHANGES_ERR_MSG =
+  'You have files with changes in current branch. Please commit or discard changed files before';
+
 export interface IBranchHeaderState {
   dropdownOpen: boolean;
   showNewBranchBox: boolean;
@@ -79,7 +82,7 @@ export class BranchHeader extends React.Component<
     } else {
       showErrorMessage(
         'Switching branch disabled',
-        'You have staged changes in current branch. Please commit / discard them before switching to another branch.'
+        CHANGES_ERR_MSG + 'switching to another branch.'
       );
     }
   }
@@ -102,7 +105,7 @@ export class BranchHeader extends React.Component<
     } else {
       showErrorMessage(
         'Creating new branch disabled',
-        'You have staged changes in current branch. Please commit / discard them before creating a new branch.'
+        CHANGES_ERR_MSG + 'creating a new branch.'
       );
     }
   };

src/components/GitPanel.tsx

@@ -198,10 +198,10 @@ export class GitPanel extends React.Component<
             stagedFiles={this.state.stagedFiles}
             data={this.state.branches}
             disabled={
-              this.state.pastCommits.length === 0 ||
               (this.props.settings.composite[
                 'disableBranchWithChanges'
-              ] as boolean)
+              ] as boolean) &&
+              (!!this.state.unstagedFiles || !!this.state.stagedFiles)
             }
             toggleSidebar={this.toggleSidebar}
             sideBarExpanded={this.state.isHistoryVisible}