Commit 11a84265 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

HgitalyRepository: fixing ff_merge

This last direct use of `hg_sha_map` obviously can't do
the right thing on HgitalyRepository, where the Hg SHA is just
"the" SHA.

--HG--
branch : heptapod
parent 775cf7fcd7e6
......@@ -777,7 +777,7 @@ def can_be_merged?(source_sha, target_branch)
def ff_merge(user, source_sha, target_branch, for_mr_iid: nil)
forbid_merge_in_topic(target_branch)
source_hgsha = hg_sha_map[source_sha]
source_hgsha = hgsha_from_sha(source_sha)
raise ArgumentError, 'Invalid merge target' unless find_branch(target_branch).target
hg_branch = begin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment