Merge pull request #33 from ryancyq/skip-untracked

ryancyq · web-flow · commit 0301a922e654 · 2024-10-02T12:39:26.000+08:00
fix: add file changes process only git tracked files
diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts
@@ -19,7 +19,6 @@ describe('Git CLI', () => {
       const execMock = jest.spyOn(exec, 'exec').mockResolvedValue(0)
 
       await switchBranch('new-branch')
-      expect(execMock).toHaveBeenCalled()
       expect(execMock).toHaveBeenCalledWith(
         'git',
         ['checkout', '-b', 'new-branch'],
@@ -97,7 +96,6 @@ describe('Git CLI', () => {
         .mockReturnValue(false)
 
       await pushCurrentBranch()
-      expect(execMock).toHaveBeenCalled()
       expect(execMock).toHaveBeenCalledWith(
         'git',
         ['push', '--porcelain', '--set-upstream', 'origin', 'HEAD'],
@@ -190,7 +188,6 @@ describe('Git CLI', () => {
       const execMock = jest.spyOn(exec, 'exec').mockResolvedValue(0)
 
       await addFileChanges(['*.ts', '~/.bashrc'])
-      expect(execMock).toHaveBeenCalled()
       expect(execMock).toHaveBeenCalledWith(
         'git',
         ['add', '--', '/test-workspace/*.ts', '/test-workspace/~/.bashrc'],
@@ -284,7 +281,13 @@ describe('Git CLI', () => {
         })
 
       const changes = await getFileChanges()
-      expect(execMock).toHaveBeenCalled()
+      expect(execMock).toHaveBeenCalledWith(
+        'git',
+        ['status', '-suno', '--porcelain'],
+        expect.objectContaining({
+          listeners: { stdline: expect.anything(), errline: expect.anything() },
+        })
+      )
       expect(changes).toBeDefined()
       expect(changes.additions).toBeDefined()
       expect(changes.additions).toHaveLength(5)
diff --git a/dist/index.js b/dist/index.js
@@ -30578,7 +30578,7 @@ function processFileChanges(output) {
 }
 function getFileChanges() {
     return __awaiter(this, void 0, void 0, function* () {
-        const { debug } = yield execGit(['status', '-suall', '--porcelain']);
+        const { debug } = yield execGit(['status', '-suno', '--porcelain']);
         const { additions, deletions } = processFileChanges(debug);
         const filesChanges = {};
         if (additions.length > 0) {
diff --git a/src/git.ts b/src/git.ts
@@ -88,7 +88,7 @@ function processFileChanges(output: string[]) {
 }
 
 export async function getFileChanges(): Promise<FileChanges> {
-  const { debug } = await execGit(['status', '-suall', '--porcelain'])
+  const { debug } = await execGit(['status', '-suno', '--porcelain'])
   const { additions, deletions } = processFileChanges(debug)
   const filesChanges: FileChanges = {}
   if (additions.length > 0) {

Original file line number	Diff line number	Diff line change
`@@ -30578,7 +30578,7 @@ function processFileChanges(output) {`
`30578`	`30578`	`}`
`30579`	`30579`	`function getFileChanges() {`
`30580`	`30580`	`return __awaiter(this, void 0, void 0, function* () {`
`30581`		`- const { debug } = yield execGit(['status', '-suall', '--porcelain']);`
	`30581`	`+ const { debug } = yield execGit(['status', '-suno', '--porcelain']);`
`30582`	`30582`	`const { additions, deletions } = processFileChanges(debug);`
`30583`	`30583`	`const filesChanges = {};`
`30584`	`30584`	`if (additions.length > 0) {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ function processFileChanges(output: string[]) {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`export async function getFileChanges(): Promise<FileChanges> {`
`91`		`- const { debug } = await execGit(['status', '-suall', '--porcelain'])`
	`91`	`+ const { debug } = await execGit(['status', '-suno', '--porcelain'])`
`92`	`92`	`const { additions, deletions } = processFileChanges(debug)`
`93`	`93`	`const filesChanges: FileChanges = {}`
`94`	`94`	`if (additions.length > 0) {`