From b659f491eaa9313a91c0ddab16e4604553aa3a41 Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.uk> Date: Sat, 2 Sep 2023 10:41:00 +0100 Subject: [PATCH] fix(scripts): shebang and exit code --- bin/git-abort | 4 ++-- bin/git-continue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/git-abort b/bin/git-abort index 078c3da2..cd7e067c 100755 --- a/bin/git-abort +++ b/bin/git-abort @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Abort a rebase, merge, `am`, a cherry-pick or a revert, depending on the situation. @@ -16,5 +16,5 @@ elif [[ -e .git/MERGE_MODE ]] ; then exec git merge --abort "$@" else echo git-abort: unknown state - exit -1 + exit 1 fi diff --git a/bin/git-continue b/bin/git-continue index 9bebe0d8..9649ec95 100755 --- a/bin/git-continue +++ b/bin/git-continue @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Continue a rebase or cherry-pick in the event of conflicts. @@ -12,5 +12,5 @@ elif [[ -e .git/rebase-merge ]] ; then exec git rebase --continue "$@" else echo git-abort: unknown state - exit -1 + exit 1 fi