1 files changed, 13 insertions, 6 deletions

diff --git a/gist b/gist
index a115958..5b05f04 100755
--- a/gist
+++ b/gist
@@ -267,7 +267,7 @@ _check_repo_status() {
   else
     cd "$1" || exit 1
     # git status is not clean or working on non-master branch
-    if [[ -n $(git status --short) || $(git branch) =~ '\* (main|master)' ]] &>/dev/null; then
+    if [[ -n $(git status --short) || $(git branch) =~ "\* $(_remote_head)" ]] &>/dev/null; then
       echo "\e[36m[working]\e[0m"
     else
       # files contents are not the same with the last time called GIST API, so warn user to call 'gist fetch'
@@ -470,20 +470,27 @@ _query_user() {
   done || { echo "Failed to query $1's gists"; exit 1; }
 }
 
+_remote_head() {
+  [ -d .git/ ] || return 1
+  local origin_head_content="$(cat .git/refs/remotes/origin/HEAD)"
+  echo ${origin_head_content##*/}
+}
+
 # Return the unique code for current commit, to compare repo status and the result of 'gist fetch'
 # Because there is no way to get commit SHA with 'gist fetch'
 _blob_code() {
-  cd "$1" && git ls-tree master | cut -d' ' -f3 | cut -c-7 | sort | paste -sd '-'
+  cd "$1" || return 1
+  cd "$1" && git ls-tree $(_remote_head) | cut -d' ' -f3 | cut -c-7 | sort | paste -sd '-'
 }
 
 _pull_if_needed() {
   sed -ne "/$1 / p" "$INDEX" \
   | while read -r "${INDEX_FORMAT[@]}"; do
-    local repo; repo=$folder/$1
-    local blob_code_local; blob_code_local=$(_blob_code "$repo")
+    local repo=$folder/$1
+    local blob_code_local=$(_blob_code "$repo")
     cd "$repo" \
     && [[ $blob_code_local != "$blob_code" ]] \
-    && [[ $(git rev-parse origin/master) == $(git rev-parse master) ]] \
+    && [[ $(git rev-parse origin/HEAD) == $(git rev-parse $(remote_head)) ]] \
     && git pull &
   done
 }
@@ -653,7 +660,7 @@ _push_to_remote() {
     git add . && git commit -m 'update'
   fi
   if [[ -n $(git cherry) ]]; then
-    git push origin master && \
+    git push && \
     http_method GET "$GITHUB_API/gists/${GIST_ID}" | _update_gist $index
   fi
 }