]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jc/whitespace-incomplete-line'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Dec 2025 02:31:40 +0000 (18:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Dec 2025 02:31:40 +0000 (18:31 -0800)
commit3b212a83feea0962d437a3d5883cdd635403fe3c
tree446e71b654752ef15a60d8a57869f322c75cc9af
parentffd9bb1bc7ffc635ff8687b79c23a6a0a3551185
parent51358a1ede7f4b6b50e4e5a86558af5204691fe0
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
.gitattributes
Documentation/config/core.adoc
diff.c
diff.h