mirror of
https://github.com/microsoft/vscode.git
synced 2025-12-22 19:29:17 +00:00
Git - fix bug with comparing with a remote branch (#273705)
* Git - fix bug with comparing with a remote branch * Update placeholder
This commit is contained in:
@@ -116,7 +116,7 @@ class RefItem implements QuickPickItem {
|
||||
case RefType.Head:
|
||||
return `refs/heads/${this.ref.name}`;
|
||||
case RefType.RemoteHead:
|
||||
return `refs/remotes/${this.ref.remote}/${this.ref.name}`;
|
||||
return `refs/remotes/${this.ref.name}`;
|
||||
case RefType.Tag:
|
||||
return `refs/tags/${this.ref.name}`;
|
||||
}
|
||||
@@ -5117,7 +5117,7 @@ export class CommandCenter {
|
||||
return itemsProcessor.processRefs(refs);
|
||||
};
|
||||
|
||||
const placeHolder = l10n.t('Select a source reference to compare to');
|
||||
const placeHolder = l10n.t('Select a source reference to compare with');
|
||||
const sourceRef = await this.pickRef(getRefPicks(), placeHolder);
|
||||
|
||||
if (!(sourceRef instanceof BranchItem)) {
|
||||
@@ -5130,7 +5130,7 @@ export class CommandCenter {
|
||||
}
|
||||
|
||||
try {
|
||||
const changes = await repository.diffTrees(historyItemRef.id, sourceRef.refId);
|
||||
const changes = await repository.diffTrees(sourceRef.refId, historyItemRef.id);
|
||||
|
||||
if (changes.length === 0) {
|
||||
window.showInformationMessage(l10n.t('The selected references have no differences.'));
|
||||
|
||||
Reference in New Issue
Block a user