Merge branch 'master' of github.com:lvv/git-prompt

archon810 · Jul 6, 2012 · ddadd2c · ddadd2c
2 parents ca9ddab + bd2ab74
commit ddadd2c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/git-prompt.sh b/git-prompt.sh
@@ -296,7 +296,11 @@ set_shell_label() {
 
         host=${HOSTNAME}
         if [[ $short_hostname = "on" ]]; then
-            host=`hostname -s`
+			if [[ "$(uname)" =~ "CYGWIN" ]]; then
+				host=`hostname`
+			else 
+				host=`hostname -s`
+			fi
         fi
         host=${host#$default_host}
         uphost=`echo ${host} | tr a-z A-Z`