X-Git-Url: https://git.madduck.net/etc/myrepos.git/blobdiff_plain/9accdc373ab36eb191f01d7be6b0493432afd30e..dd2897b6650b70fb32f1d4dba4abdf9b51a05cb0:/.mr/base?ds=sidebyside

diff --git a/.mr/base b/.mr/base
index 3531413..059b590 100644
--- a/.mr/base
+++ b/.mr/base
@@ -12,20 +12,20 @@ checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/git.git
 checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/zsh.git' 'zsh.git' '../../'
 
 [.fgits/vim.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/vim.git' 'vim.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/vim.git' 'vim.git' '../../'
 
 [.fgits/screen.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/screen.git' 'screen.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/screen.git' 'screen.git' '../../'
 
 [.fgits/crontab.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/crontab.git' 'crontab.git' '../../' && make -C ~/.crontab.d
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/crontab.git' 'crontab.git' '../../' && make -C ~/.crontab.d
 update = GIT_DIR=$MR_REPO git pull "$@" && make -C ~/.crontab.d
 
 [.fgits/a2ps.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/a2ps.git' 'a2ps.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/a2ps.git' 'a2ps.git' '../../'
 
 [.fgits/top.git]
-checkout = git_fake_bare_checkout 'ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/top.git' 'top.git' '../../'
+checkout = git_fake_bare_checkout 'ssh://git.madduck.net/madduck/pub/etc/top.git' 'top.git' '../../'
 
 [code/mr]
 checkout = checkout_hack_branch mr \
@@ -34,7 +34,10 @@ checkout = checkout_hack_branch mr \
         ln -fs ../code/mr/mr ~/.bin/mr
         git branch vcsh origin/vcsh
 update = case "$(git config --get remote.origin.url)" in
-           *git.madduck.net*) git pull "$@";;
+           *git.madduck.net*|madduck:*)
+              git branch -D fu 2>/dev/null || :
+              git branch -r -d origin/fu 2>/dev/null || :
+              git pull "$@";;
            *) git remote add joeyh git://git.kitenet.net/mr || :
               git fetch joeyh
               git checkout -b joeyh joeyh/master || :