diff options
author | Michael Lohmann <mi.al.lohmann@gmail.com> | 2024-02-28 08:54:53 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-02-28 10:02:46 -0800 |
commit | f476143ee6c8a58f41c569e4a637bc441b1e6f4a (patch) | |
tree | c20bac1753d024fbddfdd7423e989d6b0279ea6e /builtin/commit.c | |
parent | 186b115d3062e6230ee296d1ddaa0c4b72a464b5 (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 <gitster@pobox.com>
Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions