Differential D20450 Diff 48808 src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
Changeset View
Changeset View
Standalone View
Standalone View
src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
Show First 20 Lines • Show All 360 Lines • ▼ Show 20 Lines | if ($remote_refs === $local_refs) { | ||||
'identical.')); | 'identical.')); | ||||
return false; | return false; | ||||
} | } | ||||
$this->logRefDifferences($remote_refs, $local_refs); | $this->logRefDifferences($remote_refs, $local_refs); | ||||
$fetch_rules = $this->getGitFetchRules($repository); | $fetch_rules = $this->getGitFetchRules($repository); | ||||
// For very old non-bare working copies, we need to use "--update-head-ok" | |||||
// to tell Git that it is allowed to overwrite whatever is currently | |||||
// checked out. See T13280. | |||||
$future = $repository->getRemoteCommandFuture( | $future = $repository->getRemoteCommandFuture( | ||||
'fetch --prune -- %P %Ls', | 'fetch --prune --update-head-ok -- %P %Ls', | ||||
$repository->getRemoteURIEnvelope(), | $repository->getRemoteURIEnvelope(), | ||||
$fetch_rules); | $fetch_rules); | ||||
$future | $future | ||||
->setCWD($path) | ->setCWD($path) | ||||
->resolvex(); | ->resolvex(); | ||||
} | } | ||||
▲ Show 20 Lines • Show All 379 Lines • Show Last 20 Lines |