Resolving issue #13, #18 and #25

lib/cli.ml

@@ -14,7 +14,8 @@ let cmd_clear =
   Command.basic
     ~summary:"Clear all local changes without the ability to recover"
     (let%map_open.Command force =
-       flag "f" no_arg ~doc:"Clear forcefully without asking any questions"
+       flag "f" ~aliases:[ "--force" ] no_arg
+         ~doc:"Clear forcefully without asking any questions"
      in
      fun () -> Git.clear (to_force_flag force))
 
@@ -40,7 +41,8 @@ let cmd_new =
 let cmd_push =
   Command.basic ~summary:"Push the current branch to origin"
     (let%map_open.Command force =
-       flag "f" no_arg ~doc:"Push forcefully and override changes"
+       flag "f" ~aliases:[ "--force" ] no_arg
+         ~doc:"Push forcefully and override changes"
      in
      fun () -> Git.push (to_force_flag force))
 
@@ -63,15 +65,13 @@ let cmd_status =
 
 let cmd_switch =
   Command.basic ~summary:"Switch to [branch] and sync it with origin"
-    (let%map_open.Command branch =
-       anon (maybe_with_default "main" ("branch" %: string))
-     in
+    (let%map_open.Command branch = anon (maybe ("branch" %: string)) in
      fun () -> Git.switch branch)
 
 let cmd_sync =
   Command.basic ~summary:"Sync local branch with the remote branch"
     (let%map_open.Command force =
-       flag "f" no_arg
+       flag "f" ~aliases:[ "--force" ] no_arg
          ~doc:
            "Sync forcefully by overriding local version with the remote one \
             instead of rebasing"

lib/git.ml

@@ -131,7 +131,8 @@ let stash msg_opt =
 
 let status = Status.status
 
-let switch branch =
+let switch branch_opt =
+  let branch = branch_or_main branch_opt in
   Process.proc @@ Printf.sprintf "git checkout %s" branch;
   Process.proc "git pull --ff-only --prune"
 

lib/git.mli

@@ -28,7 +28,7 @@ val stash : string option -> unit
 val status : string -> unit
 (** Show pretty status of local changes. *)
 
-val switch : string -> unit
+val switch : string option -> unit
 (** Switch to a new branch and update to the latest version of origin. *)
 
 val sync : force_flag -> unit

lib/status.ml

@@ -221,7 +221,7 @@ let expand_renamed_paths (left : string) (right : string) : string =
   let append_path (p1 : string) (p2 : string) =
     if String.is_empty p1 then p2
     else if String.is_empty p2 then p1
-    else if Char.( = ) p1.[String.length p1 - 1] '/' && Caml.( == ) p2.[0] '/'
+    else if Char.( = ) p1.[String.length p1 - 1] '/' && Stdlib.( == ) p2.[0] '/'
     then p1 ^ String.drop_prefix p2 1
     else p1 ^ p2
   in
@@ -283,10 +283,16 @@ let parse_diff_details (stat_line : string) : diff_details option =
     1 file changed, 5 insertions(+), 6 deletions(-)
    ```
 *)
+
+let get_git_base_dir =
+  Process.proc_stdout "git rev-parse --show-toplevel"
+  |> String.rstrip ~drop:(fun c -> Char.( = ) c '\n')
+
 let get_file_diff_stat ~(commit : string) ~(file : string) : diff_details =
   let diff_stat =
     Process.proc_stdout
-    @@ Printf.sprintf "git diff %s --stat --color=never -- %s" commit file
+    @@ Printf.sprintf "git diff %s --stat --color=never -- %s" commit
+         (get_git_base_dir ^ "/" ^ file)
   in
   match String.split_lines diff_stat with
   | stat_line :: _ ->