projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lt/fix-sol-pack'
[git.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index
5eae094
..
e496905
100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-267,6
+267,7
@@
static void builtin_diff(const char *name_a,
ecbdata.label_path = lbl;
xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = 3;
ecbdata.label_path = lbl;
xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = 3;
+ xecfg.flags = XDL_EMIT_FUNCNAMES;
if (!diffopts)
;
else if (!strncmp(diffopts, "--unified=", 10))
if (!diffopts)
;
else if (!strncmp(diffopts, "--unified=", 10))
@@
-299,7
+300,7
@@
void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
unsigned short mode)
{
if (mode) {
unsigned short mode)
{
if (mode) {
- spec->mode =
DIFF_FILE_CANON_MODE
(mode);
+ spec->mode =
canon_mode
(mode);
memcpy(spec->sha1, sha1, 20);
spec->sha1_valid = !!memcmp(sha1, null_sha1, 20);
}
memcpy(spec->sha1, sha1, 20);
spec->sha1_valid = !!memcmp(sha1, null_sha1, 20);
}