diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-06-12 11:01:33 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-06-12 11:01:33 +0100 |
| commit | 3a832348a36065f1b3c380b8d5ab52e21be6d988 (patch) | |
| tree | 77c789b0efe2119bebb1f888397ebe01ca9df1fb | |
| parent | 09816159211b1f6d5526b32441e43b08f2b0afee (diff) | |
| download | svn-git-migration-3a832348a36065f1b3c380b8d5ab52e21be6d988.tar svn-git-migration-3a832348a36065f1b3c380b8d5ab52e21be6d988.tar.gz svn-git-migration-3a832348a36065f1b3c380b8d5ab52e21be6d988.tar.bz2 svn-git-migration-3a832348a36065f1b3c380b8d5ab52e21be6d988.tar.xz svn-git-migration-3a832348a36065f1b3c380b8d5ab52e21be6d988.zip | |
Ignore an error (it's OK if this fails)
| -rwxr-xr-x | scripts/mageia-reset-and-import.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 | \ |