admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

diff: convert struct combine_diff_path to object_id

Browse Source 
Also, convert a constant to GIT_SHA1_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2015-03-13 23:39:33 +00:00
committed by Junio C Hamano
parent fa33c3aae2
commit 1ff57c13c5
4 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tree-diff.c
View File

@@ -64,7 +64,7 @@ static int emit_diff_first_parent_only(struct diff_options *opt, struct combine_
{
struct combine_diff_parent *p0 = &p->parent[0];
if (p->mode && p0->mode) {
opt->change(opt, p0->mode, p->mode, p0->sha1, p->sha1,
opt->change(opt, p0->mode, p->mode, p0->oid.hash, p->oid.hash,
1, 1, p->path, 0, 0);
}
else {
@@ -74,11 +74,11 @@ static int emit_diff_first_parent_only(struct diff_options *opt, struct combine_
if (p->mode) {
addremove = '+';
sha1 = p->sha1;
sha1 = p->oid.hash;
mode = p->mode;
} else {
addremove = '-';
sha1 = p0->sha1;
sha1 = p0->oid.hash;
mode = p0->mode;
}
@@ -151,7 +151,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,
memcpy(p->path + base->len, path, pathlen);
p->path[len] = 0;
p->mode = mode;
hashcpy(p->sha1, sha1 ? sha1 : null_sha1);
hashcpy(p->oid.hash, sha1 ? sha1 : null_sha1);
return p;
}
@@ -238,7 +238,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
}
p->parent[i].mode = mode_i;
hashcpy(p->parent[i].sha1, sha1_i ? sha1_i : null_sha1);
hashcpy(p->parent[i].oid.hash, sha1_i ? sha1_i : null_sha1);
}
keep = 1;