]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 186b115)
revision: ensure MERGE_HEAD is a ref in prepare_show_merge
authorMichael Lohmann <redacted>
Wed, 28 Feb 2024 13:54:53 +0000 (08:54 -0500)
committerJunio C Hamano <redacted>
Wed, 28 Feb 2024 18:02:46 +0000 (10:02 -0800)
commitf476143ee6c8a58f41c569e4a637bc441b1e6f4a
treec20bac1753d024fbddfdd7423e989d6b0279ea6etree
parent186b115d3062e6230ee296d1ddaa0c4b72a464b5commit | diff
revision: ensure MERGE_HEAD is a ref in prepare_show_merge

This is done to

 (1) ensure MERGE_HEAD is a ref,
 (2) obtain the oid without any prefixing by refs.c:repo_dwim_ref()
 (3) error out when MERGE_HEAD is a symref.

Helped-by: Junio C Hamano <redacted>
Signed-off-by: Michael Lohmann <redacted>
Signed-off-by: Junio C Hamano <redacted>
Signed-off-by: Philippe Blain <redacted>
Signed-off-by: Junio C Hamano <redacted>
revision.c diff | blob | history
git clone https://git.99rst.org/PROJECT