accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-13 16:56:33 +00:00
Code Issues Releases Activity

Fix remote.upstream.fetch if --branch was used to get-app

Browse Source
This commit is contained in:
Pratik Vyas 2015-05-06 10:55:53 +05:30
parent e5088d28b6
commit c2acc81cd4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bench/app.py
View File

@ -151,7 +151,10 @@ def switch_branch(branch, apps=None, bench='.', upgrade=False):
for app in apps:
app_dir = os.path.join(apps_dir, app)
if os.path.exists(app_dir):
exec_cmd("git fetch upstream", cwd=app_dir)
unshallow = "--unshallow" if os.path.exists(os.path.join(app_dir, ".git", "shallow")) else ""
exec_cmd("git config --unset-all remote.upstream.fetch", cwd=app_dir)
exec_cmd("git config --add remote.upstream.fetch '+refs/heads/*:refs/remotes/upstream/*'", cwd=app_dir)
exec_cmd("git fetch upstream {unshallow}".format(unshallow=unshallow), cwd=app_dir)
exec_cmd("git checkout {branch}".format(branch=branch), cwd=app_dir)
exec_cmd("git merge upstream/{branch}".format(branch=branch), cwd=app_dir)