This repository was archived by the owner on Jun 21, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed
Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -105,10 +105,11 @@ public IObservable<Unit> Pull(ILocalRepositoryModel repository)
105105
106106 public IObservable < Unit > Push ( ILocalRepositoryModel repository )
107107 {
108- return Observable . Defer ( ( ) =>
108+ return Observable . Defer ( async ( ) =>
109109 {
110110 var repo = gitService . GetRepository ( repository . LocalPath ) ;
111- return gitClient . Push ( repo , repo . Head . TrackedBranch . UpstreamBranchCanonicalName , repo . Head . Remote . Name ) . ToObservable ( ) ;
111+ var remote = await gitClient . GetHttpRemote ( repo , repo . Head . Remote . Name ) ;
112+ return gitClient . Push ( repo , repo . Head . TrackedBranch . UpstreamBranchCanonicalName , remote . Name ) . ToObservable ( ) ;
112113 } ) ;
113114 }
114115
@@ -171,8 +172,13 @@ public IObservable<BranchTrackingDetails> CalculateHistoryDivergence(ILocalRepos
171172 return Observable . Defer ( async ( ) =>
172173 {
173174 var repo = gitService . GetRepository ( repository . LocalPath ) ;
175+
174176 if ( repo . Head . Remote != null )
175- await gitClient . Fetch ( repo , repo . Head . Remote . Name ) ;
177+ {
178+ var remote = await gitClient . GetHttpRemote ( repo , repo . Head . Remote . Name ) ;
179+ await gitClient . Fetch ( repo , remote . Name ) ;
180+ }
181+
176182 return Observable . Return ( repo . Head . TrackingDetails ) ;
177183 } ) ;
178184 }
You can’t perform that action at this time.
0 commit comments