Skip to content

Commit 8eb6eae

Browse files
committedJul 16, 2018
Properly report deteched HEAD state
1 parent 6d37976 commit 8eb6eae

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed
 

‎src/git-status.sh

+12-7
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@ GREEN='\033[0;32m'
55
CYAN='\033[1;36m'
66
NC='\033[0m'
77

8-
UPSTREAM=${1:-'@{u}'}
9-
LOCAL=$(git rev-parse @)
10-
REMOTE=$(git rev-parse "$UPSTREAM")
11-
BASE=$(git merge-base @ "$UPSTREAM")
8+
if ! git symbolic-ref --short HEAD 2>/dev/null; then
9+
echo "${CYAN}?${NC} Deteached HEAD"
10+
exit 1
11+
fi
1212

13-
if [ $LOCAL = $REMOTE ]; then
13+
UPSTREAM=${1:-'@{u}'};
14+
LOCAL=$(git rev-parse @);
15+
REMOTE=$(git rev-parse "$UPSTREAM");
16+
BASE=$(git merge-base @ "$UPSTREAM");
17+
18+
if [ "${LOCAL}" = "${REMOTE}" ]; then
1419
echo "${GREEN}${NC} Up to date"
15-
elif [ $LOCAL = $BASE ]; then
20+
elif [ "${LOCAL}" = "${BASE}" ]; then
1621
echo "${RED}${NC} Pull Needed"
17-
elif [ $REMOTE = $BASE ]; then
22+
elif [ "${REMOTE}" = "${BASE}" ]; then
1823
echo "${CYAN}${NC} Push Needed"
1924
else
2025
echo "${RED}${NC} Diverged"

0 commit comments

Comments
 (0)