From c86531c439007c785a0cce49b21e4754c0abb768 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 13 Jun 2017 17:11:50 +0300
Subject: [PATCH] - Added test and fix when in detached head.
---
merge-conflict | 2 +-
tests/merge-conflict.bats | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/merge-conflict b/merge-conflict
index 12853e3..f8eea80 100755
--- a/merge-conflict
+++ b/merge-conflict
@@ -2,7 +2,7 @@
set -eu
dest="${1:-master}"
-current="$(git symbolic-ref --short HEAD)"
+current="$(git symbolic-ref --short HEAD)" || exit 0 # Detached head.
[ "$current" != "$dest" ] || exit 0
diff --git a/tests/merge-conflict.bats b/tests/merge-conflict.bats
index f2af693..5b603ce 100755
--- a/tests/merge-conflict.bats
+++ b/tests/merge-conflict.bats
@@ -25,6 +25,12 @@ export repo="$BATS_TMPDIR/testrepo"
fi
}
+@test "Detached head" {
+ cd "$repo"
+ git checkout "$(git rev-parse HEAD)"
+ merge-conflict
+}
+
@test "Same branch" {
cd "$repo"
git checkout master || true
--
GitLab