Skip to content

Commit

Permalink
Fix fetching via ssh
Browse files Browse the repository at this point in the history
Before, the return value of fetchFrom: was used to checkout the default branch when cloning.
Since dcc1389, this is only needed for the internal implementation,
so the return value is not needed for the general fetchFrom: anymore. This allows us to not return the
refs when fetching externally, fixing fetching via ssh.
  • Loading branch information
MariusDoe committed May 23, 2024
1 parent dcc1389 commit c33d1f0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
git porcelain - external
fetchAllExternalFrom: aRemoteName
| remote url |
remote := self unitOfWork remoteNamed: aRemoteName.
remote ifNil: [(GitRemoteUndefined remote: remote) signal: 'No URL configured.'].
self externalGitDo: ('fetch {1}{2}' format: {
GitFeatureFlags pruneWhenFetching ifTrue: ['--prune '] ifFalse: [''].
aRemoteName}).
self refsChangedExternally.
url := remote url ifNil: [(GitRemoteUndefined remote: remote) signal: 'No URL configured.'].
^ (GitAbstractProtocol url: url) refs
self refsChangedExternally.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
git porcelain
fetchFrom: aRemoteName
^ GitFeatureFlags externalFetchAndPush
GitFeatureFlags externalFetchAndPush
ifTrue: [self fetchAllExternalFrom: aRemoteName]
ifFalse: [[self fetchInternalFrom: aRemoteName]
on: ConnectionClosed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"externalCommand:" : "mad 5/22/2024 13:55",
"externalGitDo:" : "mad 5/22/2024 13:29",
"externalPush:toRemote:force:" : "mad 5/18/2024 12:26",
"fetchAllExternalFrom:" : "mad 5/18/2024 11:48",
"fetchFrom:" : "mad 4/22/2024 17:34",
"fetchAllExternalFrom:" : "mad 5/23/2024 18:46",
"fetchFrom:" : "mad 5/23/2024 18:10",
"fetchFromAll:" : "mad 4/22/2024 17:25",
"fetchInternalFrom:" : "mad 4/22/2024 17:24",
"filesystemOn:" : "CamilloBruni 8/30/2012 14:06",
Expand Down

0 comments on commit c33d1f0

Please sign in to comment.