Fix staging with diff.noprefix and --no-prefix

jonas · Jun 3, 2024 · 2e60ebd · 2e60ebd
1 parent de984e2
commit 2e60ebd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/NEWS.adoc b/NEWS.adoc
@@ -6,7 +6,7 @@ master
 
 Bug fixes:
 
- - Fix parsing of `--no-prefix` argument.
+ - Fix various issues with `diff.noprefix` and `--no-prefix`.
 
 Improvements:
 

diff --git a/src/stage.c b/src/stage.c
@@ -205,6 +205,8 @@ stage_apply_chunk(struct view *view, struct line *chunk, struct line *single,
 	if (!diff_hdr)
 		return false;
 
+	if (opt_diff_noprefix)
+		apply_argv[argc++] = "-p0";
 	if (!revert)
 		apply_argv[argc++] = "--cached";
 	if (revert || stage_line_type == LINE_STAT_STAGED)