]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jc/whitespace-incomplete-line' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Nov 2025 19:48:47 +0000 (11:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Nov 2025 19:48:48 +0000 (11:48 -0800)
commit9682c7f652567eaa256c0a63e922a1260d7186cd
treecc320a4b920227df0ce0e25e328a82a61494870b
parent10610d9a571d5b07094b20b8119ad5d181d122bf
parent51358a1ede7f4b6b50e4e5a86558af5204691fe0
Merge branch 'jc/whitespace-incomplete-line' into next

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
.gitattributes
Documentation/config/core.adoc
diff.c
diff.h