various updates

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/+bin/git-up b/+bin/git-up
index d9fc1cd..35e0e9d 100755 (executable)
--- a/+bin/git-up
+++ b/+bin/git-up
@@ -69,11 +69,14 @@ if test -z "$action"; then
     esac
 fi
 
+no_changes () {
+       git diff-index --quiet --cached HEAD --ignore-submodules -- &&
+       git diff-files --quiet --ignore-submodules
+}
+
 unclean=
-git rev-parse --verify HEAD > /dev/null && \
-    git update-index --refresh && \
-    git diff-files --quiet && \
-    git diff-index --cached --quiet HEAD -- || unclean=t
+no_changes || unclean=t
+
 
 case "$action" in
     rebase)
@@ -96,6 +99,6 @@ if test -n "$unclean"; then
         echo ""
         echo "run 'git stash apply' when rebase is finished"
     else
-        git stash apply
+        git stash pop
     fi
 fi

diff --git a/config/zsh/20_environment b/config/zsh/20_environment
index 30be9fd..8dc12cc 100644 (file)
--- a/config/zsh/20_environment
+++ b/config/zsh/20_environment
@@ -13,6 +13,7 @@ export EDITOR=vim
 export VISUAL=vim
 export CCACHE_DIR="$HOME/.cache/ccache"
 export CCACHE_NOCOMPRESS=NoThanks
+export CCACHE_HARDLINK=YesPlease
 
 export RLWRAP_HOME="$HOME/.cache/rlwrap/"
 export GTK_IM_MODULE=xim