aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-11-30 18:31:40 -0800
committerJunio C Hamano <gitster@pobox.com>2025-11-30 18:31:40 -0800
commit3b212a83feea0962d437a3d5883cdd635403fe3c (patch)
tree446e71b654752ef15a60d8a57869f322c75cc9af /diff.h
parentffd9bb1bc7ffc635ff8687b79c23a6a0a3551185 (diff)
parent51358a1ede7f4b6b50e4e5a86558af5204691fe0 (diff)
downloadgit-3b212a83feea0962d437a3d5883cdd635403fe3c.tar.gz
Merge branch 'jc/whitespace-incomplete-line'
Both "git apply" and "git diff" learn a new whitespace error class, "incomplete-line". * jc/whitespace-incomplete-line: attr: enable incomplete-line whitespace error for this project diff: highlight and error out on incomplete lines apply: check and fix incomplete lines whitespace: allocate a few more bits and define WS_INCOMPLETE_LINE apply: revamp the parsing of incomplete lines diff: update the way rewrite diff handles incomplete lines diff: call emit_callback ecbdata everywhere diff: refactor output of incomplete line diff: keep track of the type of the last line seen diff: correct suppress_blank_empty hack diff: emit_line_ws_markup() if/else style fix whitespace: correct bit assignment comments
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/diff.h b/diff.h
index 31eedd5c0c..b3a4c6335b 100644
--- a/diff.h
+++ b/diff.h
@@ -331,9 +331,9 @@ struct diff_options {
int ita_invisible_in_index;
/* white-space error highlighting */
-#define WSEH_NEW (1<<12)
-#define WSEH_CONTEXT (1<<13)
-#define WSEH_OLD (1<<14)
+#define WSEH_NEW (1<<16)
+#define WSEH_CONTEXT (1<<17)
+#define WSEH_OLD (1<<18)
unsigned ws_error_highlight;
const char *prefix;
int prefix_length;