Add the --recount option to the git apply command for more reliable patch application

robertpiosik · robertpiosik · commit 80599a4be172 · 2025-05-29T14:31:15.000+02:00
diff --git a/packages/vscode/src/commands/apply-chat-response-command/utils/patch-handler.ts b/packages/vscode/src/commands/apply-chat-response-command/utils/patch-handler.ts
@@ -215,7 +215,8 @@ export async function apply_git_patch(
       let used_fallback = false
       try {
         await execAsync(
-          'git apply --whitespace=fix --ignore-whitespace ' + temp_file,
+          'git apply --whitespace=fix --ignore-whitespace --recount ' +
+            temp_file,
           {
             cwd: workspace_path
           }

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ export async function apply_git_patch(`
`215`	`215`	`let used_fallback = false`
`216`	`216`	`try {`
`217`	`217`	`await execAsync(`
`218`		`- 'git apply --whitespace=fix --ignore-whitespace ' + temp_file,`
	`218`	`+ 'git apply --whitespace=fix --ignore-whitespace --recount ' +`
	`219`	`+ temp_file,`
`219`	`220`	`{`
`220`	`221`	`cwd: workspace_path`
`221`	`222`	`}`