@@ -588,6 +588,7 @@ export class SimpleGit extends GitManager {
588
588
@param {boolean } force - If true, merge strategy `--strategy-option=theirs` is used. This will prefer remote changes over local changes.
589
589
*/
590
590
async pull ( force : boolean ) : Promise < FileStatusResult [ ] | undefined > {
591
+ const progressNotice = this . plugin . displayMessage ( "Initializing pull" ) ;
591
592
this . plugin . setPluginState ( { gitAction : CurrentGitAction . pull } ) ;
592
593
try {
593
594
if ( this . plugin . settings . updateSubmodules )
@@ -605,6 +606,9 @@ export class SimpleGit extends GitManager {
605
606
this . plugin . log (
606
607
"No tracking branch found. Ignoring pull of main repo and updating submodules only."
607
608
) ;
609
+ this . plugin . displayMessage (
610
+ "No tracking branch found. Ignoring pull of main repo and updating submodules only."
611
+ ) ;
608
612
return ;
609
613
}
610
614
@@ -614,6 +618,7 @@ export class SimpleGit extends GitManager {
614
618
] ) ;
615
619
616
620
if ( localCommit !== upstreamCommit ) {
621
+ let err = false ;
617
622
if (
618
623
this . plugin . settings . syncMethod === "merge" ||
619
624
this . plugin . settings . syncMethod === "rebase"
@@ -649,6 +654,7 @@ export class SimpleGit extends GitManager {
649
654
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
650
655
`Sync failed (${ this . plugin . settings . syncMethod } ): ${ "message" in err ? err . message : err } `
651
656
) ;
657
+ err = true ;
652
658
}
653
659
}
654
660
this . app . workspace . trigger ( "obsidian-git:head-change" ) ;
@@ -662,6 +668,8 @@ export class SimpleGit extends GitManager {
662
668
"--name-only" ,
663
669
] ) ;
664
670
671
+ if ( ! err ) this . plugin . displayMessage ( "Finished pull" ) ;
672
+
665
673
return filesChanged
666
674
. split ( / \r \n | \r | \n / )
667
675
. filter ( ( value ) => value . length > 0 )
0 commit comments