* Improve unison support.

[code/myrepos.git] / mrconfig.complex

diff --git a/mrconfig.complex b/mrconfig.complex
index c0a1484aae7f267fd2adc3a27639983bea2980fe..11f7f6f4bcf1e2bca7d433b45b0fddc9015549e1 100644 (file)
--- a/mrconfig.complex
+++ b/mrconfig.complex
@@ -11,7 +11,7 @@ svn_cleanup = svn cleanup "$@"
 git_gc = git gc "$@"
 git_push = git push "$@"
 git_tag = git tag -l
 git_gc = git gc "$@"
 git_push = git push "$@"
 git_tag = git tag -l

-svn_tag = svn ls "$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"
+svn_tag = svn ls "$(LC_ALL=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"

 # This hack is here because git-pull stupidly outputs tag info to stderr.
 # Shut it up but let real errors through, for use in cron.
 quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true
 # This hack is here because git-pull stupidly outputs tag info to stderr.
 # Shut it up but let real errors through, for use in cron.
 quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true


@@ -104,6 +104,11 @@ checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linu
 skip = ! mylaptop || ([ "$1" = update ] && ! hours_since "$1" 12)
 push = error "as if!"
 
 skip = ! mylaptop || ([ "$1" = update ] && ! hours_since "$1" 12)
 push = error "as if!"
 

+[/etc]
+# I use etckeeper to keep /etc in git. But it only works if I'm root, 
+# and if it's not already in etc, skip it.
+skip = ! test -d /etc/.git || ! test "$(whoami)" = root
+

 [dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.
 checkout = 
 [dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.
 checkout =