@@ -267,11 +267,11 @@ end
267
267
--- @param path string
268
268
--- @param rev Rev ?
269
269
function GitAdapter :get_show_args (path , rev )
270
- return utils .vec_join (self :args (), " show" , fmt (" %s:%s" , rev and rev :object_name () or " " , path ))
270
+ return utils .vec_join (self :args (), " show" , " --no-show-signature " , fmt (" %s:%s" , rev and rev :object_name () or " " , path ))
271
271
end
272
272
273
273
function GitAdapter :get_log_args (args )
274
- return utils .vec_join (" log" , " --first-parent" , " --stat" , args )
274
+ return utils .vec_join (" log" , " --no-show-signature " , " -- first-parent" , " --stat" , args )
275
275
end
276
276
277
277
function GitAdapter :get_dir (path )
@@ -311,14 +311,14 @@ function GitAdapter:get_merge_context()
311
311
end
312
312
313
313
local ret = {}
314
- local out , code = self :exec_sync ({ " show" , " -s" , " --pretty=format:%H%n%D" , " HEAD" , " --" }, self .ctx .toplevel )
314
+ local out , code = self :exec_sync ({ " show" , " -s" , " --pretty=format:%H%n%D" , " HEAD" , " --no-show-signature " , " -- " }, self .ctx .toplevel )
315
315
316
316
ret .ours = code ~= 0 and {} or {
317
317
hash = out [1 ],
318
318
ref_names = out [2 ],
319
319
}
320
320
321
- out , code = self :exec_sync ({ " show" , " -s" , " --pretty=format:%H%n%D" , their_head , " --" }, self .ctx .toplevel )
321
+ out , code = self :exec_sync ({ " show" , " -s" , " --pretty=format:%H%n%D" , their_head , " --no-show-signature " , " -- " }, self .ctx .toplevel )
322
322
323
323
ret .theirs = code ~= 0 and {} or {
324
324
hash = out [1 ],
@@ -330,7 +330,7 @@ function GitAdapter:get_merge_context()
330
330
331
331
ret .base = {
332
332
hash = out [1 ],
333
- ref_names = self :exec_sync ({ " show" , " -s" , " --pretty=format:%D" , out [1 ] }, self .ctx .toplevel )[1 ],
333
+ ref_names = self :exec_sync ({ " show" , " -s" , " --pretty=format:%D" , out [1 ], " --no-show-signature " }, self .ctx .toplevel )[1 ],
334
334
}
335
335
336
336
return ret
@@ -570,6 +570,7 @@ function GitAdapter:stream_fh_data(state)
570
570
" -c" ,
571
571
" core.quotePath=false" ,
572
572
" log" ,
573
+ " --no-show-signature" ,
573
574
" --pretty=format:%x00%n" .. GitAdapter .COMMIT_PRETTY_FMT ,
574
575
" --numstat" ,
575
576
" --raw" ,
@@ -649,6 +650,7 @@ function GitAdapter:stream_line_trace_data(state)
649
650
" -c" ,
650
651
" core.quotePath=false" ,
651
652
" log" ,
653
+ " --no-show-signature" ,
652
654
" --color=never" ,
653
655
" --no-ext-diff" ,
654
656
" --pretty=format:%x00%n" .. GitAdapter .COMMIT_PRETTY_FMT ,
@@ -720,6 +722,7 @@ function GitAdapter:file_history_dry_run(log_opt)
720
722
else
721
723
cmd = utils .vec_join (
722
724
" log" ,
725
+ " --no-show-signature" ,
723
726
" --pretty=format:%H" ,
724
727
" --name-status" ,
725
728
options ,
@@ -1036,6 +1039,7 @@ GitAdapter.fh_retry_commit = async.wrap(function(self, rev_arg, state, opt, call
1036
1039
" --pretty=format:" .. GitAdapter .COMMIT_PRETTY_FMT ,
1037
1040
" --numstat" ,
1038
1041
" --raw" ,
1042
+ " --no-show-signature" ,
1039
1043
" --diff-merges=" .. state .log_options .diff_merges ,
1040
1044
(state .single_file and state .log_options .follow ) and " --follow" or nil ,
1041
1045
rev_arg ,
0 commit comments