handle overwritten untracked files (#281)

* handle overwritten untracked files * fix regex for untracked overwritten files
desktop · Feb 14, 2019 · 78fa7e9 · 78fa7e9
1 parent f975c07
commit 78fa7e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/errors.ts b/lib/errors.ts
@@ -105,7 +105,7 @@ export const GitErrorRegexes = {
   'Another git process seems to be running in this repository, e.g.':
     GitError.LockFileAlreadyExists,
   'fatal: There is no merge to abort': GitError.NoMergeToAbort,
-  'error: Your local changes to the following files would be overwritten by checkout:':
+  'error: (?:Your local changes to the following|The following untracked working tree) files would be overwritten by checkout:':
     GitError.LocalChangesOverwritten,
   // GitHub-specific errors
   'error: GH001: ': GitError.PushWithFileSizeExceedingLimit,

diff --git a/test/fast/git-process-test.ts b/test/fast/git-process-test.ts
@@ -402,10 +402,16 @@ remove the file manually to continue.`
     })
 
     it('can parse the local files overwritten error', () => {
-      const stderr =
+      let stderr =
         'error: Your local changes to the following files would be overwritten by checkout:\n'
 
-      const error = GitProcess.parseError(stderr)
+      let error = GitProcess.parseError(stderr)
+      expect(error).toBe(GitError.LocalChangesOverwritten)
+
+      stderr =
+        'error: The following untracked working tree files would be overwritten by checkout:\n'
+
+      error = GitProcess.parseError(stderr)
       expect(error).toBe(GitError.LocalChangesOverwritten)
     })
   })