global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-27 18:29:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/whitespace-incomplete-line' into jch

Browse Source 
It does not make much sense to apply the "incomplete-line"
whitespace rule to symbolic links, whose contents almost always
lack the final newline.  "git apply" and "git diff" are now taught
to exclude them for a change to symbolic links.

* jc/whitespace-incomplete-line:
  whitespace: symbolic links usually lack LF at the end
This commit is contained in:
Junio C Hamano
2026-02-23 14:25:44 -08:00
parent ea7a9c8bac 6a41481c6d
commit dc4e49cf7e
4 changed files with 152 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
diff.c
View File

@@ -1837,6 +1837,7 @@ static void emit_rewrite_diff(const char *name_a,
const char *a_prefix, *b_prefix;
char *data_one, *data_two;
size_t size_one, size_two;
unsigned ws_rule;
struct emit_callback ecbdata;
struct strbuf out = STRBUF_INIT;
@@ -1859,9 +1860,15 @@ static void emit_rewrite_diff(const char *name_a,
size_one = fill_textconv(o->repo, textconv_one, one, &data_one);
size_two = fill_textconv(o->repo, textconv_two, two, &data_two);
ws_rule = whitespace_rule(o->repo->index, name_b);
/* symlink being an incomplete line is not a news */
if (DIFF_FILE_VALID(two) && S_ISLNK(two->mode))
ws_rule &= ~WS_INCOMPLETE_LINE;
memset(&ecbdata, 0, sizeof(ecbdata));
ecbdata.color_diff = o->use_color;
ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b);
ecbdata.ws_rule = ws_rule;
ecbdata.opt = o;
if (ecbdata.ws_rule & WS_BLANK_AT_EOF) {
mmfile_t mf1, mf2;
@@ -3759,6 +3766,7 @@ static void builtin_diff(const char *name_a,
xpparam_t xpp;
xdemitconf_t xecfg;
struct emit_callback ecbdata;
unsigned ws_rule;
const struct userdiff_funcname *pe;
if (must_show_header) {
@@ -3770,6 +3778,12 @@ static void builtin_diff(const char *name_a,
mf1.size = fill_textconv(o->repo, textconv_one, one, &mf1.ptr);
mf2.size = fill_textconv(o->repo, textconv_two, two, &mf2.ptr);
ws_rule = whitespace_rule(o->repo->index, name_b);
/* symlink being an incomplete line is not a news */
if (DIFF_FILE_VALID(two) && S_ISLNK(two->mode))
ws_rule &= ~WS_INCOMPLETE_LINE;
pe = diff_funcname_pattern(o, one);
if (!pe)
pe = diff_funcname_pattern(o, two);
@@ -3781,7 +3795,7 @@ static void builtin_diff(const char *name_a,
lbl[0] = NULL;
ecbdata.label_path = lbl;
ecbdata.color_diff = o->use_color;
ecbdata.ws_rule = whitespace_rule(o->repo->index, name_b);
ecbdata.ws_rule = ws_rule;
if (ecbdata.ws_rule & WS_BLANK_AT_EOF)
check_blank_at_eof(&mf1, &mf2, &ecbdata);
ecbdata.opt = o;
@@ -3988,6 +4002,10 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
data.ws_rule = whitespace_rule(o->repo->index, attr_path);
data.conflict_marker_size = ll_merge_marker_size(o->repo->index, attr_path);
/* symlink being an incomplete line is not a news */
if (DIFF_FILE_VALID(two) && S_ISLNK(two->mode))
data.ws_rule &= ~WS_INCOMPLETE_LINE;
if (fill_mmfile(o->repo, &mf1, one) < 0 ||
fill_mmfile(o->repo, &mf2, two) < 0)
die("unable to read files to diff");