robur/git-kv
4
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

only use a single commit in rename #3

Merged
hannes merged 2 commits from rename-single-commit into main 2024-10-29 11:37:58 +00:00
Conversation 1 Commits 2 Files changed 1 +2
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 708cd7d008 - Show all commits

2
src/git_kv.ml
View file

@ -710,6 +710,8 @@ module Make (Pclock : Mirage_clock.PCLOCK) = struct
remove t source >>= fun () -> remove t source >>= fun () ->
set t dest contents set t dest contents
in in
(* (hannes) we check whether we're in a change_and_push or not, since
nested change_and_push are not supported. *)
match t.committed with match t.committed with
| Some _ -> op t | Some _ -> op t
| None -> | None ->