Skip to content
Snippets Groups Projects
Commit c86531c4 authored by nimrod's avatar nimrod
Browse files

- Added test and fix when in detached head.

parent 0dd480c0
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment