1 files changed, 16 insertions, 15 deletions

diff --git a/gist b/gist
index 439a60d..67925d7 100755
--- a/gist
+++ b/gist
@@ -8,22 +8,22 @@
 # Description: Manage your gists with git and Github API v3
 # Usage: gist [command] [<args>]
 #
-#   [star | s]                    List your gists with format below, star for your starred gists:
-#                                 [index_of_gist] [url] [file_num] [comment_num] [short description]
-#   fetch, f [star | s]           Update the local list of your gists, star for your starred gists
+#   [star | s]                    List your gists, use argument 'star' for your starred gists. Format is like: 
+#                                 <index_of_gist> <url> <file_num> <comment_num> <description>
+#   fetch,  f [star | s]          Update the local list of your gists, 'star' for your starred gists
 #   <index_of_gist> [--no-action] Show the path of local gist repo and do custom actions
-#   new, n [-d | --desc <description>] [-p] <files>... create a new gist with files
-#   new, n [-d | --desc <description>] [-p] [-f | --file <file_name>] create a new gist from STDIN
+#   new,    n [-d | --desc <description>] [-p] <file1> <file2>... create a new gist with files
+#   new,    n [-d | --desc <description>] [-p] [-f | --file <file_name>] create a new gist from STDIN
 #   detail, d <index_of_gist>     Show the detail of a gist
-#   edit, e   <index_of_gist>     Edit a gist's description
+#   edit,   e <index_of_gist>     Edit a gist's description
 #   delete, D <index_of_gist>...  Delete a gist
-#   clean, C                      Clean removed gists in local
+#   clean,  C                     Clean removed gists in local
 #   config, c [token | user | folder | auto_sync | EDITOR | action | protocol [value] ] Do configuration
-#   user, U   <user>              Get gists from a given Github user
-#   grep, g   <pattern>           Grep gists by a given pattern from description, filename or file content
-#   push, p   <index_of_gist>     Push changes by git (well, better to make commit by youself)
+#   user,   U <user>              Get gists from a given Github user
+#   grep,   g <pattern>           Grep gists by a given pattern
+#   push,   p <index_of_gist>     Push changes by git (well, better to make commit by youself)
 #   github, G <index_of_gist>     Import selected gist as a new Github repo
-#   help, h                       Show this help message
+#   help,   h                     Show this help message
 #   version                       Get the tool version
 #   update                        Update Bash-Snippet Tools
 # 
@@ -239,7 +239,7 @@ _check_repo_status() {
       fi
     else
       cd "$1" || exit
-      if [[ -n $(git status --short) ]] &>/dev/null; then
+      if [[ -n $(git status --short) || $(git branch | sed -n '/\* / s///p') != 'master' ]] &>/dev/null; then
         echo "\e[36m[working]\e[0m"
       else
         [[ $(_blob_code "$1") != "$2" ]] 2>/dev/null && echo "\e[31m[outdated]\e[0m"
@@ -336,12 +336,13 @@ _parse_response() {
 }
 
 # TODO pagnation for more than 100 gists
-# TODO add files and date of a gist
+# TODO add files of a gist
 # get latest list of gists from Github API
 _fetch_gists() {
   echo "fetching $user's gists from $GITHUB_API..."
   echo
   local route="users/$user/gists"
+  local mark=''
   if [[ $1 =~ ^(star|s)$ ]];then
     route='gists/starred'
     local mark=s
@@ -365,8 +366,8 @@ _query_user() {
   [[ -z $result ]] && echo "Failed to query $1's gists" && return 1
 
   echo "$result" \
-  | while read -r index link blob_code file_num extra description; do
-    echo "$link $file_num $extra $description" | cut -c -"$(tput cols)"
+  | while read -r index link blob_code file_num comment_num author _ _ description; do
+    echo "$link $author $file_num $comment_num $description" | cut -c -"$(tput cols)"
   done
 }