From c1bba9464871b1d1efe49a01b051895e06c9fa7c Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 15 Jan 2019 17:48:29 +0530 Subject: [PATCH] fix(release): don't fast-forward while merging --- bench/release.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bench/release.py b/bench/release.py index 85eb6014..a6b33672 100755 --- a/bench/release.py +++ b/bench/release.py @@ -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)) -