undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rp/ita-diff-modefix'

Browse Source 
"git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
bit was not showing the mode bits from the working tree.

* rp/ita-diff-modefix:
  diff-lib: use worktree mode in diffs from i-t-a entries
This commit is contained in:
Junio C Hamano 2020-08-19 16:14:44 -07:00
commit b10a44e6b6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diff-lib.c
View File

@ -219,7 +219,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
continue; continue;
} else if (revs->diffopt.ita_invisible_in_index && } else if (revs->diffopt.ita_invisible_in_index &&
ce_intent_to_add(ce)) { ce_intent_to_add(ce)) {
diff_addremove(&revs->diffopt, '+', ce->ce_mode, newmode = ce_mode_from_stat(ce, st.st_mode);
diff_addremove(&revs->diffopt, '+', newmode,
&null_oid, 0, ce->name, 0); &null_oid, 0, ce->name, 0);
continue; continue;
} }