accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 00:06:36 +00:00
Code Issues Releases Activity

fix(release): don't fast-forward while merging

Browse Source
This commit is contained in:
Sagar Vora 2019-01-15 17:48:29 +05:30
parent 97b2891a95
commit c1bba94648
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bench/release.py
View File

@ -250,7 +250,7 @@ def create_release(repo_path, new_version, from_branch='develop', to_branch='mas
g = repo.git g = repo.git
g.checkout(to_branch) g.checkout(to_branch)
try: try:
g.merge(from_branch) g.merge(from_branch, '--no-ff')
except git.exc.GitCommandError as e: except git.exc.GitCommandError as e:
handle_merge_error(e, source=from_branch, target=to_branch) handle_merge_error(e, source=from_branch, target=to_branch)
@ -358,4 +358,3 @@ def push_branch_for_old_major_version(bench_path, bump_type, app, repo_path, fro
print("Pushing {old_major_version_branch} ".format(old_major_version_branch=old_major_version_branch)) print("Pushing {old_major_version_branch} ".format(old_major_version_branch=old_major_version_branch))
print(g.push(remote, *args)) print(g.push(remote, *args))