X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/4c3dcb350066802311b52151f0f73c5bbe2603e0..refs/heads/consistent-parent-config:/mrconfig.complex diff --git a/mrconfig.complex b/mrconfig.complex index a7d8551..b96c5bf 100644 --- a/mrconfig.complex +++ b/mrconfig.complex @@ -9,13 +9,10 @@ include = cat /usr/share/mr/* 2>/dev/null || true # Teach mr to run a few git and svn specific commands. svn_cleanup = svn cleanup "$@" git_gc = git gc "$@" -git_tag = git tag -l -svn_tag = svn ls "$(LC_ALL=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')" +git_tags = git tag -l +svn_tags = svn ls "$(LC_ALL=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')" # I prefer to git-svn rebase to fetch git_svn_update = git svn rebase -# 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 # Tests used below. # - anon checks whether this is an anonymous checkout, by testing what url # $HOME uses