update zsh conf for git and ccache

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

diff --git a/config/zsh/20_environment b/config/zsh/20_environment
index 8dc12cc..f15bf7f 100644 (file)
--- a/config/zsh/20_environment
+++ b/config/zsh/20_environment
@@ -27,7 +27,16 @@ unset  VERBOSE
 if [ $UID -eq 0 ]; then
     PATH=~root/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH
 else
-    PATH="${HOME}/local/bin:/usr/lib/ccache:${HOME}/bin:${PATH}"
-    LD_LIBRARY_PATH="${HOME}/local/lib"
+    case "${PATH}" in
+        *:${HOME}/local/bin:*)
+            ;;
+        *)
+            PATH="/usr/lib/ccache:${HOME}/local/bin:${HOME}/bin:${PATH}"
+            LD_LIBRARY_PATH="${HOME}/local/lib"
+            ;;
+    esac
 fi
 
+if test -z "$TZ"; then
+    export TZ=$(cat /etc/timezone)
+fi

diff --git a/config/zsh/60_prompt b/config/zsh/60_prompt
index 86dd596..f38bc0b 100644 (file)
--- a/config/zsh/60_prompt
+++ b/config/zsh/60_prompt
@@ -32,7 +32,7 @@ precmd() {
             branch="$(cut -c1-7 "$git_dir/HEAD")..."
     fi
 
-    psvar[1]="${$(readlink -f ${git_dir:h})/$HOME/~}"
+    psvar[1]="${$(readlink -m "$(git rev-parse --show-cdup)./")/$HOME/~}"
     psvar[2]="${branch#refs/heads/}"
 }
 

diff --git a/gitconfig b/gitconfig
index 3855ae9..892be41 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -12,7 +12,8 @@
     p=!git push origin HEAD
     debtag=!git tag -f -a -s -m `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'` `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'`
     b64=commit -sm'64bits fix'
-    send=send-email --annotate --compose -C -C -M -n --to
+    send=send-email --no-chain-reply-to --suppress-cc all --suppress-from --no-signed-off-by-cc --annotate --compose -C -C -M --patience --to
+    is-send=send-email --no-chain-reply-to --suppress-cc all --suppress-from --no-signed-off-by-cc --annotate --compose --patience -C -C -M --to corp.software.review@news.intersec.com
     stage=add
     unstage=reset HEAD --
     track=add -N
@@ -31,7 +32,7 @@
     default = tracking
 
 [user]
-    name  = Pierre Habouzit
+    name = Pierre Habouzit
     email = madcoder@debian.org
 
 [color]
@@ -61,15 +62,28 @@
     requireForce = false
 [pack]
     threads = 0
+[advice]
+    pushNonFastForward = false
+    statusHints = false
 [status]
     submodulesummary = 1
-[push]
-    default = tracking
-
-[sendemail]
-    smtpserver = smtp.mail.intersec.com
-    smtpuser = madcoder
 
 [merge "dpkg-mergechangelogs"]
     name = debian/changelog merge driver
     driver = dpkg-mergechangelogs -m %O %A %B %A
+[sendemail]
+    aliasesfile = /home/madcoder/.mutt/aliases
+    aliasfiletype = mutt
+
+[url "gitolite@git.corp:"]
+    insteadOf = ssh://git.corp/srv/git/
+    insteadOf = git.corp:/srv/git/
+[reviewboard]
+    url = http://reviews.corp/
+[url "git://anonscm.debian.org"]
+    insteadOf = git://git.debian.org
+    insteadOf = git.debian.org:
+[url "ssh://git.debian.org"]
+    pushInsteadOf = git://git.debian.org
+    pushInsteadOf = git.debian.org:
+