Skip to content

fix(core): use git restore to remove vote files #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aduh95 merged 1 commit into from
May 29, 2024
Merged

fix(core): use git restore to remove vote files #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions packages/core/src/countBallotsFromGit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,23 @@ export default async function countFromGit({
} finally {
await fd.close();
}
await runChildProcessAsync(GIT_BIN, ["add", filepath], { spawnArgs });

// Remove all vote related files.
await runChildProcessAsync(GIT_BIN, ["rm", "-rf", subPath], { spawnArgs });
await runChildProcessAsync(
GIT_BIN,
[
"restore",
"--source",
`${firstCommitRef}^`,
"--staged",
"--worktree",
"--",
".",
],
{ spawnArgs }
);

await runChildProcessAsync(GIT_BIN, ["add", filepath], { spawnArgs });

await runChildProcessAsync(
GIT_BIN,
Expand Down