fix(git): improve error message when push fails

Fixes #117
tagoro9 · Sep 22, 2020 · dd377cb · dd377cb
1 parent 578b264
commit dd377cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/git/Git.ts b/src/git/Git.ts
@@ -123,7 +123,11 @@ export class Git {
     if (remoteExists) {
       this.messenger.emit('Pushing branch', Emoji.ARROW_UP);
       this.messenger.inThread(true);
-      await this.git.push(this.config.remote);
+      try {
+        await this.git.push(this.config.remote);
+      } catch (error) {
+        this.mapAndThrowError(error);
+      }
       this.messenger.inThread(false);
       return;
     }
@@ -344,6 +348,11 @@ export class Git {
     if (error.message.match(/not a git repository/)) {
       throw new GitErrorImpl(error.message, GitErrorType.NOT_A_GIT_REPO);
     }
+    if (
+      error.message.match(/Updates were rejected because the tip of your current branch is behind/)
+    ) {
+      throw new GitErrorImpl(error.message, GitErrorType.FORCE_PUSH);
+    }
     throw error;
   }
 

diff --git a/src/git/GitError.ts b/src/git/GitError.ts
@@ -2,6 +2,7 @@ export enum GitErrorType {
   BRANCH_ALREADY_EXISTS,
   NOT_A_GIT_REPO,
   NO_REMOTE,
+  FORCE_PUSH,
 }
 
 export interface GitError {

diff --git a/src/ui/errorCodeToMessage.ts b/src/ui/errorCodeToMessage.ts
@@ -3,4 +3,8 @@ import { GitErrorType } from 'src/git/GitError';
 export const ERROR_CODE_TO_MESSAGE: { [k: number]: string } = {
   [GitErrorType.BRANCH_ALREADY_EXISTS]: 'It looks like there is a branch already for this issue',
   [GitErrorType.NOT_A_GIT_REPO]: 'It looks like you run fotingo outside of a git repository',
+  [GitErrorType.FORCE_PUSH]:
+    'It looks like your branch is behind the remote. Fotingo does not support force pushing',
+  [GitErrorType.BRANCH_ALREADY_EXISTS]:
+    'It looks like your repository does not have a remote configured',
 };