atria-tools/island
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] specify the mode of merge

Browse Source
This commit is contained in:
Edouard DUPIN
2019-08-27 23:45:43 +02:00
parent 04019f5b0e
commit 825667f038
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
island/commands.py
View File

@@ -201,10 +201,13 @@ def get_tracking_branch(path_repository, remote_name, select_branch):
return remote_name + "/" + select_branch return remote_name + "/" + select_branch
def merge_branch_on_master(path_repository, branch_name): def merge_branch_on_master(path_repository, branch_name, merge_force=True, branch_destination = "master"):
if branch_name == None or branch_name == "": if branch_name == None or branch_name == "":
raise "Missing branch name" raise "Missing branch name"
cmd = "git merge --no-ff " + branch_name + " --message \"Merge branch '" + branch_name + "' into 'master'\"" cmd = "git merge "
if merge_force == True:
cmd += "--no-ff "
cmd += branch_name + " --message \"Merge branch '" + branch_name + "' into '" + branch_destination + "'\""
debug.verbose("execute : " + cmd) debug.verbose("execute : " + cmd)
# TODO: check if the command work correctly # TODO: check if the command work correctly
return_value = multiprocess.run_command(cmd, cwd=path_repository) return_value = multiprocess.run_command(cmd, cwd=path_repository)