Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
# base by setting two parents.
merge_bases = repository.get_merge_bases(public_head, stack.base)
if not stack.base in merge_bases:
# base by setting two parents.
merge_bases = repository.get_merge_bases(public_head, stack.base)
if not stack.base in merge_bases:
- message = 'Merge ' + repository.describe(stack.base)
+ message = 'Merge %s into %s' % (repository.describe(stack.base),
+ public_ref)
public_head = __create_commit(repository, stack.head.data.tree,
[public_head, stack.base], options,
message)
public_head = __create_commit(repository, stack.head.data.tree,
[public_head, stack.base], options,
message)