Try fixing ocaml#3627

Try fixing ocaml#3627 as suggested there. To test.
Blaisorblade · Oct 24, 2018 · 7f9db21 · 7f9db21
1 parent 5853cbf
commit 7f9db21
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/repository/opamGit.ml b/src/repository/opamGit.ml
@@ -156,7 +156,7 @@ module VCS : OpamVCS.VCS = struct
     (* Git diff is to the working dir, but doesn't work properly for
        unregistered directories. *)
     OpamSystem.raise_on_process_error r;
-    git repo_root ~stdout:patch_file [ "diff" ; "--no-ext-diff" ; "-R" ; "-p" ; rref; "--" ]
+    git repo_root ~stdout:patch_file [ "-c" ; "diff.noprefix=false" ; "diff" ; "--no-ext-diff" ; "-R" ; "-p" ; rref; "--" ]
     @@> fun r ->
     if not (OpamProcess.check_success_and_cleanup r) then
       (finalise ();