# # patch "git.ml" # from [1ac29b80d560eea36462e65f6fbcfc3c6715da38] # to [9b05e45086efa259a14cf38a91d2c43b0d43f80d] # --- git.ml +++ git.ml @@ -332,12 +332,12 @@ cb (`SUB_PROC_ERROR "Diffs are not suported with git yet") ; false)) | `PASKY -> - let cmd = [ "cg-diff"; "-r"; parent^":"^child ] in + let cmd = [ "git-diff-tree"; "-r"; "-p"; parent; child ] in log "exec" "### exec: Running '%s'" (String.concat " " cmd) ; let error fmt = Printf.kprintf (fun s -> cb (`SUB_PROC_ERROR s)) fmt in try - status#push "Running cg-diff ..." ; + status#push "Running git-diff-tree ..." ; ignore ( Subprocess.spawn_out ~working_directory:d.base @@ -347,10 +347,10 @@ if status <> 0 then if stderr = "" then - error "cg-diff exited with status %d:\n%s" status + error "git-diff-tree exited with status %d:\n%s" status (String.concat "\n" (List.map Printexc.to_string exceptions)) else - error "cg-diff error:\n%s" stderr + error "git-diff-tree error:\n%s" stderr else cb (`DIFF stdout))) with Gspawn.Error (_, msg) ->