Prefer non-web remote location in merge.
GitOrigin-RevId: ce678712f457a3b3ece48d26aedfe3220e54e7bf
This commit is contained in:
parent
a72021c170
commit
0f829d6bbd
@ -831,6 +831,9 @@ static int merge_choose_remote_location(const RemoteFileLocation &x, int8 x_sour
|
|||||||
}
|
}
|
||||||
// If access_hash changed use a newer one
|
// If access_hash changed use a newer one
|
||||||
if (x.type() == RemoteFileLocation::Type::Full) {
|
if (x.type() == RemoteFileLocation::Type::Full) {
|
||||||
|
if (x.full().is_web() != y.full().is_web()) {
|
||||||
|
return x.full().is_web(); // prefer non-web
|
||||||
|
}
|
||||||
if (x.full().get_access_hash() != y.full().get_access_hash()) {
|
if (x.full().get_access_hash() != y.full().get_access_hash()) {
|
||||||
return x_source < y_source;
|
return x_source < y_source;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user