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

Merge pull request #758 from sagarvora/no-ff

Browse Source 
fix(release): don't fast-forward while merging
This commit is contained in:
Sagar Vora 2019-01-22 15:07:41 +05:30 committed by GitHub
commit 11de4f1cb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.checkout(to_branch)
try:
g.merge(from_branch)
g.merge(from_branch, '--no-ff')
except git.exc.GitCommandError as e:
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(g.push(remote, *args))