Skip to content

Commit 1d4fb98

Browse files
committed
update branch
1 parent fee5412 commit 1d4fb98

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

client/src/addon_manager/commands/update.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default async (context: vscode.ExtensionContext, message: Message) => {
1414
await addon.update();
1515
await addon.setLock(false);
1616

17-
const diff = await git.diffSummary(["HEAD", "origin/submoduling"]);
17+
const diff = await git.diffSummary(["HEAD", "origin/main"]);
1818
addon.checkForUpdate(diff.files as DiffResultTextFile[]);
1919
};

client/src/addon_manager/services/addonManager.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class AddonManager {
3737

3838
public async checkUpdated() {
3939
const diff = await git.diffSummary([
40-
"submoduling",
41-
"origin/submoduling",
40+
"main",
41+
"origin/main",
4242
]);
4343
this.addons.forEach((addon) => {
4444
addon.checkForUpdate(diff.files as DiffResultTextFile[]);

client/src/addon_manager/services/git.service.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ export const setupGit = async (context: vscode.ExtensionContext) => {
2626
const isEmpty = await filesystem.empty(storageURI);
2727
if (isEmpty) {
2828
try {
29-
// const options = { "--depth": 1 };
30-
const options = {};
29+
const options = { "--depth": 1 };
3130
await git.clone(
3231
REPOSITORY_PATH,
3332
storageURI.path.substring(1),
@@ -41,14 +40,7 @@ export const setupGit = async (context: vscode.ExtensionContext) => {
4140

4241
// pull
4342
try {
44-
// If remote branch is not already checked out, check out
45-
const branches = await git.branch();
46-
if (!Object.keys(branches.branches).includes("submoduling")) {
47-
// DEBUG:
48-
await git.checkoutBranch("submoduling", "origin/submoduling");
49-
} else {
50-
await git.checkout("submoduling");
51-
}
43+
await git.checkout("main");
5244

5345
await git.fetch();
5446
await git.pull();

0 commit comments

Comments
 (0)