cleanup local tracking branches when untracking

Also, make both package_untrack and remote_untrack robust against
partially existing branches.

1 files changed, 3 insertions, 1 deletions

diff --git a/remote.inc.sh b/remote.inc.sh
index 2cce6ba..f7e5539 100644
--- a/remote.inc.sh
+++ b/remote.inc.sh
@@ -82,5 +82,7 @@ remote_get_url() {
 remote_untrack() {
   local remote=$1 pkgname=$2
 
-  git branch -dr "$remote/packages/$pkgname"
+  if git show-ref -q "refs/remotes/$remote/packages/$pkgname"; then
+    git branch -dr "$remote/packages/$pkgname"
+  fi
 }