Merge remote-tracking branch 'upstream/development' into windows-arm-…

…support

app/package.json

@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "2.4.4-beta4",
+  "version": "2.5.1-beta1",
   "main": "./main.js",
   "repository": {
     "type": "git",

app/src/lib/feature-flag.ts

@@ -169,7 +169,7 @@ export function enableForkyCreateBranchUI(): boolean {
  * are new commits upstream.)
  */
 export function enableNDDBBanner(): boolean {
-  return enableBetaFeatures()
+  return false
 }
 
 /**

app/src/lib/git/tag.ts

@@ -84,6 +84,7 @@ export async function fetchTagsToPush(
     branchName,
     '--follow-tags',
     '--dry-run',
+    '--no-verify',
     '--porcelain',
   ]
 

app/src/lib/shell.ts

@@ -10,7 +10,7 @@ type IndexLookup = {
 /**
  * The names of any env vars that we shouldn't copy from the shell environment.
  */
-const BlacklistedNames = new Set(['LOCAL_GIT_DIRECTORY'])
+const ExcludedEnvironmentVars = new Set(['LOCAL_GIT_DIRECTORY'])
 
 /**
  * Inspect whether the current process needs to be patched to get important
@@ -152,7 +152,7 @@ async function getEnvironmentFromShell(
  */
 function mergeEnvironmentVariables(env: IndexLookup) {
   for (const key in env) {
-    if (BlacklistedNames.has(key)) {
+    if (ExcludedEnvironmentVars.has(key)) {
       continue
     }
 

app/src/lib/stores/git-store.ts

@@ -265,7 +265,15 @@ export class GitStore extends BaseStore {
 
   public async refreshTags() {
     const previousTags = this._localTags
-    this._localTags = await getAllTags(this.repository)
+    const newTags = await this.performFailableOperation(() =>
+      getAllTags(this.repository)
+    )
+
+    if (newTags === undefined) {
+      return
+    }
+
+    this._localTags = newTags
 
     if (previousTags !== null) {
       // We don't await for the emition of updates to finish

app/src/ui/dispatcher/error-handlers.ts

@@ -188,7 +188,10 @@ export async function gitAuthenticationErrorHandler(
   return null
 }
 
-/** Handle git clone errors to give chance to retry error. */
+/**
+ * Handle git clone errors to give chance to retry error.
+ * Doesn't handle auth errors.
+ */
 export async function gitCloneErrorHandler(
   error: Error,
   dispatcher: Dispatcher
@@ -207,6 +210,12 @@ export async function gitCloneErrorHandler(
     return error
   }
 
+  const dugiteError = gitError.result.gitError
+  // don't catch this if this its an auth error
+  if (dugiteError !== null && AuthenticationErrors.has(dugiteError)) {
+    return error
+  }
+
   const repository = e.metadata.repository
   if (!repository) {
     return error

app/src/ui/history/commit-list-item.tsx

@@ -89,15 +89,30 @@ export class CommitListItem extends React.PureComponent<
             </div>
           </div>
         </div>
-        <div className="commit-indicators">
-          {enableGitTagsDisplay() &&
-            renderCommitListItemTags(this.props.commit.tags)}
-          {this.renderUnpushedIndicator()}
-        </div>
+        {this.renderCommitIndicators()}
       </div>
     )
   }
 
+  private renderCommitIndicators() {
+    const tagIndicator = enableGitTagsDisplay()
+      ? renderCommitListItemTags(this.props.commit.tags)
+      : null
+
+    const unpushedIndicator = this.renderUnpushedIndicator()
+
+    if (tagIndicator || unpushedIndicator) {
+      return (
+        <div className="commit-indicators">
+          {tagIndicator}
+          {unpushedIndicator}
+        </div>
+      )
+    }
+
+    return null
+  }
+
   private renderUnpushedIndicator() {
     if (!this.props.showUnpushedIndicator) {
       return null

app/src/ui/index.tsx

@@ -4,6 +4,8 @@ import * as React from 'react'
 import * as ReactDOM from 'react-dom'
 import * as Path from 'path'
 
+import * as moment from 'moment'
+
 import { ipcRenderer, remote } from 'electron'
 
 import { App } from './app'
@@ -86,6 +88,11 @@ process.env['LOCAL_GIT_DIRECTORY'] = Path.resolve(__dirname, 'git')
 //   Focus Ring! -- A11ycasts #16: https://youtu.be/ilj2P5-5CjI
 require('wicg-focus-ring')
 
+// setup this moment.js plugin so we can use easier
+// syntax for formatting time duration
+const momentDurationFormatSetup = require('moment-duration-format')
+momentDurationFormatSetup(moment)
+
 const startTime = performance.now()
 
 if (!process.env.TEST_ENV) {
@@ -277,6 +284,7 @@ const dispatcher = new Dispatcher(
 )
 
 dispatcher.registerErrorHandler(defaultErrorHandler)
+dispatcher.registerErrorHandler(gitCloneErrorHandler)
 dispatcher.registerErrorHandler(upstreamAlreadyExistsHandler)
 dispatcher.registerErrorHandler(externalEditorErrorHandler)
 dispatcher.registerErrorHandler(openShellErrorHandler)
@@ -292,7 +300,6 @@ dispatcher.registerErrorHandler(missingRepositoryHandler)
 dispatcher.registerErrorHandler(localChangesOverwrittenHandler)
 dispatcher.registerErrorHandler(rebaseConflictsHandler)
 dispatcher.registerErrorHandler(refusedWorkflowUpdate)
-dispatcher.registerErrorHandler(gitCloneErrorHandler)
 
 document.body.classList.add(`platform-${process.platform}`)
 

app/src/ui/relative-time.tsx

@@ -1,9 +1,5 @@
 import * as React from 'react'
 import * as moment from 'moment'
-const momentDurationFormatSetup = require('moment-duration-format')
-
-// setup moment plugin
-momentDurationFormatSetup(moment)
 
 interface IRelativeTimeProps {
   /**

app/src/ui/tab-bar.tsx

@@ -160,7 +160,7 @@ class TabBarItem extends React.Component<ITabBarItemProps, {}> {
         onClick={this.onClick}
         role="tab"
         aria-selected={selected}
-        tabIndex={selected ? 0 : -1}
+        tabIndex={selected ? undefined : -1}
         onKeyDown={this.onKeyDown}
         type="button"
       >

app/styles/ui/_list.scss

@@ -51,8 +51,8 @@
         // Positioning
         position: absolute;
         top: 0px;
-        right: 3px;
-        width: 15px;
+        right: 1px;
+        width: 12px;
 
         // Only support vertical scrolling for now
         overflow-y: auto;

app/styles/ui/_repository-list.scss

@@ -71,6 +71,7 @@
       display: flex;
       justify-content: flex-end;
       align-items: center;
+      margin-right: var(--spacing-half);
     }
 
     .change-indicator-wrapper {

app/styles/ui/history/_commit-list.scss

@@ -16,7 +16,9 @@
 
     border-bottom: var(--base-border);
 
-    padding: 0 var(--spacing);
+    // We need to give a bit more padding to the right to make place for the scrollbar
+    padding-right: calc(var(--spacing) + var(--spacing-half));
+    padding-left: var(--spacing);
 
     .info {
       display: flex;
@@ -50,6 +52,7 @@
       margin-left: var(--spacing);
       color: var(--list-item-badge-color);
       height: 16px;
+      line-height: 16px;
       max-width: 50%;
 
       .tag-indicator {

changelog.json

@@ -1,5 +1,20 @@
 {
   "releases": {
+    "2.5.1-beta1": [
+      "[Fixed] Center tags text vertically in History view - #9785",
+      "[Fixed] Prevent Git authentication errors from prompting to retry clone instead of authentication dialog - #9777",
+      "[Improved] Avoid executing unwanted Git hooks when fetching unpushed tags - #9793"
+    ],
+    "2.5.0": [
+      "[New] Add, push, and view Git tags on commit history in Desktop - #9424",
+      "[Added] Offer option to choose file from one branch or the other when resolving merge conflicts - #9702",
+      "[Added] Add context menu for highlighted text in diff view - #5100. Thanks @HashimotoYT!",
+      "[Fixed] Retain default branch option in \"Create Branch\" dialog when user focuses away from Desktop - #9611",
+      "[Improved] Clean up copy for onboarding sign-in flow - #9715",
+      "[Improved] Emphasize signing in to GitHub via browser due to username/password deprecation - #9663",
+      "[Improved] Improve error message when publishing a private repository fails - #9646",
+      "[Improved] Offer to retry if cloning a repository fails - #926. Thanks @Daniel-McCarthy!"
+    ],
     "2.4.4-beta4": [
       "[Fixed] Add missing \"Cancel\" button in onboarding sign-in flow - #9715",
       "[Improved] Update copy for onboarding sign-in flow - #9715"

docs/known-issues.md

@@ -114,7 +114,7 @@ are unable to find another cygwin DLL.
 
 Enabling Mandatory ASLR affects the MSYS2 core library, which is relied upon by Git for Windows to emulate process forking.
 
-**Not supported:** this is an upstream limitation of MSYS2, and it is recommend that you either disable Mandatory ASLR or whitelist all executables under `<Git>\usr\bin` which depend on MSYS2.
+**Not supported:** this is an upstream limitation of MSYS2, and it is recommend that you either disable Mandatory ASLR or explicitly allow all executables under `<Git>\usr\bin` which depend on MSYS2.
 
 ### I get a black screen when launching Desktop