ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-18 10:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correct parsing of git output blocks and improve stash UI accessibility

Browse Source
This commit is contained in:
gsxdsm
2026-02-17 23:15:16 -08:00
parent dd4c738e91
commit 887e2ea76b
3 changed files with 54 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/server/src/routes/worktree/routes/commit-log.ts
View File

@@ -48,7 +48,16 @@ export function createCommitLogHandler() {
const commitBlocks = logOutput.split('---END---').filter((block) => block.trim());
for (const block of commitBlocks) {
const lines = block.split('\n');
const allLines = block.split('\n');
// Skip leading empty lines that result from the split.
// After splitting on ---END---, subsequent blocks start with a newline,
// which creates an empty first element that shifts all field indices
// (hash becomes empty, shortHash becomes hash, etc.).
let startIndex = 0;
while (startIndex < allLines.length && allLines[startIndex].trim() === '') {
startIndex++;
}
const lines = allLines.slice(startIndex);
if (lines.length >= 6) {
const hash = lines[0].trim();

32
apps/server/src/services/branch-commit-log-service.ts
View File

@@ -69,10 +69,19 @@ export async function getBranchCommitLog(
// Parse the output into structured commit objects
const commits: BranchCommit[] = [];
const commitBlocks = logOutput.split('---END---\n').filter((block) => block.trim());
const commitBlocks = logOutput.split('---END---').filter((block) => block.trim());
for (const block of commitBlocks) {
const lines = block.split('\n');
const allLines = block.split('\n');
// Skip leading empty lines that result from the split.
// After splitting on ---END---, subsequent blocks start with a newline,
// which creates an empty first element that shifts all field indices
// (hash becomes empty, shortHash becomes hash, etc.).
let startIndex = 0;
while (startIndex < allLines.length && allLines[startIndex].trim() === '') {
startIndex++;
}
const lines = allLines.slice(startIndex);
if (lines.length >= 6) {
const hash = lines[0].trim();
@@ -80,13 +89,22 @@ export async function getBranchCommitLog(
let files: string[] = [];
try {
const filesOutput = await execGitCommand(
['diff-tree', '--no-commit-id', '--name-only', '-r', hash],
// -m causes merge commits to be diffed against each parent,
// showing all files touched by the merge (without -m, diff-tree
// produces no output for merge commits because they have 2+ parents)
['diff-tree', '--no-commit-id', '--name-only', '-r', '-m', hash],
worktreePath
);
files = filesOutput
.trim()
.split('\n')
.filter((f) => f.trim());
// Deduplicate: -m can list the same file multiple times
// (once per parent diff for merge commits)
files = [
...new Set(
filesOutput
.trim()
.split('\n')
.filter((f) => f.trim())
),
];
} catch {
// Ignore errors getting file list
}