From de14061b6896f1a106eca5d7eab926135156094d Mon Sep 17 00:00:00 2001 From: j Date: Sun, 14 Jul 2019 22:43:20 +0100 Subject: [PATCH] ignore more files, fix switch branch --- .gitignore | 5 +++++ update.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index da0f04d5..e3a95437 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,17 @@ secret.txt local_settings.py lib +lib64 include share src bin static/json/pandora.json static/js/pandora.min.js +static/djcelery +etc/bash_completion.d +etc/fish +pyvenv.cfg config.jsonc local static/js/pandora.min.js.gz diff --git a/update.py b/update.py index 8639b8b8..86dbe643 100755 --- a/update.py +++ b/update.py @@ -280,6 +280,8 @@ if __name__ == "__main__": os.chdir(path) current_branch = get_branch(path) if current_branch != branch: + run('git', 'remote', 'set-branches', 'origin', '*') + run('git', 'fetch', 'origin') run('git', 'checkout', branch) revno = get_version(path) if repo == 'pandora':