branch: externals/vc-jj
commit ba05d9d70ab53d40eee5419f7c52115df359f42d
Author: Wojciech Siewierski <[email protected]>
Commit: Wojciech Siewierski <[email protected]>
Don't expose the internal --git diff flag to the user
---
vc-jj.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vc-jj.el b/vc-jj.el
index 8cd6e03769..35da0d8e96 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -87,7 +87,7 @@ If nil, use the value of `vc-checkin-switches'. If t, use no
switches."
(string :tag "Argument String")
(repeat :tag "Argument List" :value ("") string)))
-(defcustom vc-jj-diff-switches '("--git")
+(defcustom vc-jj-diff-switches t
"String or list of strings specifying switches for \"jj diff\".
If nil, use the value of `vc-diff-switches'. If t, use no switches."
:type '(choice (const :tag "Unspecified" nil)
@@ -503,7 +503,7 @@ For jj, modify `.gitignore' and call `jj untrack' or `jj
track'."
(setq rev1 "root()")))
(setq rev2 (or rev2 "@"))
(let ((inhibit-read-only t)
- (args (append (vc-switches 'jj 'diff) (list "--") files)))
+ (args (append (vc-switches 'jj 'diff) (list "--git" "--") files)))
(with-current-buffer buffer
(erase-buffer))
(apply #'call-process vc-jj-program nil buffer nil "diff" "--from" rev1
"--to" rev2 args)
