From 3a832348a36065f1b3c380b8d5ab52e21be6d988 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 12 Jun 2013 11:01:33 +0100 Subject: Ignore an error (it's OK if this fails) --- scripts/mageia-reset-and-import.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh index e7787cc..5bbef3b 100755 --- a/scripts/mageia-reset-and-import.sh +++ b/scripts/mageia-reset-and-import.sh @@ -320,7 +320,7 @@ git push origin master 'refs/remotes/*:refs/heads/*' pushd ../$SOFTWARE.git git branch -D trunk -git branch -D origin/master +git branch -D origin/master 2>/dev/null # Tagging logic inspired by https://github.com/nothingmuch/git-svn-abandon/blob/master/git-svn-abandon-fix-refs git for-each-ref --format='%(refname)' refs/heads/tags | cut -d / -f 4 | \ -- cgit v1.2.1