File tree Expand file tree Collapse file tree 2 files changed +5
-0
lines changed
gix-merge/src/blob/platform Expand file tree Collapse file tree 2 files changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -376,6 +376,10 @@ impl<'parent> PlatformRef<'parent> {
376
376
labels : builtin_driver:: text:: Labels < ' _ > ,
377
377
context : gix_command:: Context ,
378
378
) -> Result < ( inner:: builtin_merge:: Pick , Resolution ) , Error > {
379
+ let _span = gix_trace:: coarse!(
380
+ "gix_merge::blob::PlatformRef::merge()" ,
381
+ current_rela_path = %self . current. rela_path
382
+ ) ;
379
383
match self . configured_driver ( ) {
380
384
Ok ( driver) => {
381
385
let mut cmd = self . prepare_external_driver ( driver. command . clone ( ) , labels, context) ?;
Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ impl Platform {
46
46
kind : ResourceKind ,
47
47
objects : & impl gix_object:: FindObjectOrHeader ,
48
48
) -> Result < ( ) , Error > {
49
+ gix_trace:: detail!( "gix_merge::blob::Platform::set_resource()" , %id, %rela_path) ;
49
50
if !matches ! (
50
51
mode,
51
52
gix_object:: tree:: EntryKind :: Blob | gix_object:: tree:: EntryKind :: BlobExecutable
You can’t perform that action at this time.
0 commit comments