0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

ignore more files, fix switch branch

Browse source
This commit is contained in:
j 2019-07-14 22:43:20 +01:00
parent 7864ca1f70
commit de14061b68
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -1,12 +1,17 @@
secret.txt secret.txt
local_settings.py local_settings.py
lib lib
lib64
include include
share share
src src
bin bin
static/json/pandora.json static/json/pandora.json
static/js/pandora.min.js static/js/pandora.min.js
static/djcelery
etc/bash_completion.d
etc/fish
pyvenv.cfg
config.jsonc config.jsonc
local local
static/js/pandora.min.js.gz static/js/pandora.min.js.gz

2
update.py
View file

@ -280,6 +280,8 @@ if __name__ == "__main__":
os.chdir(path) os.chdir(path)
current_branch = get_branch(path) current_branch = get_branch(path)
if current_branch != branch: if current_branch != branch:
run('git', 'remote', 'set-branches', 'origin', '*')
run('git', 'fetch', 'origin')
run('git', 'checkout', branch) run('git', 'checkout', branch)
revno = get_version(path) revno = get_version(path)
if repo == 'pandora': if repo == 'pandora':