@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
When repairing Git remote URIs, include credentials
Summary: See IRC. Currently, if a fetch fails, we may repair the remote URI incorrectly, replacing it with one without any credentials. Instead, retain credentials.
Test Plan: Faked it locally, got le-boom to verify on IRC.
Reviewers: btrahan
Reviewed By: btrahan
CC: aran
Differential Revision: https://secure.phabricator.com/D8055
+3
-3
+3
-3
src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
+3
-3
src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
···
303
303
// Fix remote origin url if it doesn't match our configuration
304
304
$origin_url = $repository->execLocalCommand(
305
305
'config --get remote.origin.url');
306
-
$remote_uri = $repository->getDetail('remote-uri');
307
-
if ($origin_url != $remote_uri) {
306
+
$remote_uri = $repository->getRemoteURIEnvelope();
307
+
if ($origin_url != $remote_uri->openEnvelope()) {
308
308
$repository->execLocalCommand(
309
-
'remote set-url origin %s',
309
+
'remote set-url origin %P',
310
310
$remote_uri);
311
311
}
312
312
} else if ($err) {