multipleof4/GitRight
1
0
Fork 0
mirror of https://github.com/multipleof4/GitRight.git synced 2026-02-04 10:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Resolve GitRPC BadObjectState via deduplication

Browse Source
This commit is contained in:
multipleof4
2026-01-20 13:06:45 -08:00
parent 9c2631123f
commit 73522e230c
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
index.html
View File

@@ -243,24 +243,38 @@
const lastCommitData = await this.apiRequest(`/git/commits/${lastCommitSha}`); const lastCommitData = await this.apiRequest(`/git/commits/${lastCommitSha}`);
const baseTreeSha = lastCommitData.tree.sha; const baseTreeSha = lastCommitData.tree.sha;
const treePayload = []; // Deduplicate changes by path to prevent GitRPC::BadObjectState
const finalChanges = new Map();
this.pendingChanges.forEach(change => { this.pendingChanges.forEach(change => {
const mode = change.itemType === 'tree' ? '040000' : '100644'; const mode = change.itemType === 'tree' ? '040000' : '100644';
if (change.type === 'delete') { if (change.type === 'delete') {
treePayload.push({ path: change.path, mode, type: change.itemType, sha: null }); finalChanges.set(change.path, { path: change.path, mode, type: change.itemType, sha: null });
} else if (change.type === 'rename' || change.type === 'move') { } else if (change.type === 'rename' || change.type === 'move') {
treePayload.push({ path: change.oldPath, mode, type: change.itemType, sha: null }); finalChanges.set(change.oldPath, { path: change.oldPath, mode, type: change.itemType, sha: null });
treePayload.push({ path: change.path, mode, type: change.itemType, sha: change.sha }); finalChanges.set(change.path, { path: change.path, mode, type: change.itemType, sha: change.sha });
} else if (change.type === 'add') { } else if (change.type === 'add') {
if (change.sha) { const entry = { path: change.path, mode, type: change.itemType };
treePayload.push({ path: change.path, mode, type: change.itemType, sha: change.sha }); if (change.sha) entry.sha = change.sha;
} else { else entry.content = '\n';
treePayload.push({ path: change.path, mode, type: change.itemType, content: '\n' }); finalChanges.set(change.path, entry);
}
} }
}); });
// Optimization: If a parent folder is being deleted, don't explicitly delete children
const pathsToDelete = Array.from(finalChanges.values())
.filter(c => c.sha === null)
.map(c => c.path)
.sort((a, b) => a.length - b.length);
const treePayload = Array.from(finalChanges.values()).filter(change => {
if (change.sha === null) {
const hasParentDeleted = pathsToDelete.some(p => change.path.startsWith(p + '/') && change.path !== p);
return !hasParentDeleted;
}
return true;
});
const newTree = await this.apiRequest('/git/trees', 'POST', { const newTree = await this.apiRequest('/git/trees', 'POST', {
base_tree: baseTreeSha, base_tree: baseTreeSha,
tree: treePayload tree: treePayload