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

tree-diff: convert path_appendnew to object_id

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2017-05-30 10:31:07 -07:00 committed by Junio C Hamano
parent fda94b416e
commit 0e72462fb4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tree-diff.c
View File

@ -132,7 +132,7 @@ static int emit_diff_first_parent_only(struct diff_options *opt, struct combine_
*/ */
static struct combine_diff_path *path_appendnew(struct combine_diff_path *last, static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,
int nparent, const struct strbuf *base, const char *path, int pathlen, int nparent, const struct strbuf *base, const char *path, int pathlen,
unsigned mode, const unsigned char *sha1) unsigned mode, const struct object_id *oid)
{ {
struct combine_diff_path *p; struct combine_diff_path *p;
size_t len = st_add(base->len, pathlen); size_t len = st_add(base->len, pathlen);
@ -162,7 +162,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,
memcpy(p->path + base->len, path, pathlen); memcpy(p->path + base->len, path, pathlen);
p->path[len] = 0; p->path[len] = 0;
p->mode = mode; p->mode = mode;
hashcpy(p->oid.hash, sha1 ? sha1 : null_sha1); oidcpy(&p->oid, oid ? oid : &null_oid);
return p; return p;
} }
@ -221,7 +221,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
if (emitthis) { if (emitthis) {
int keep; int keep;
struct combine_diff_path *pprev = p; struct combine_diff_path *pprev = p;
p = path_appendnew(p, nparent, base, path, pathlen, mode, oid ? oid->hash : NULL); p = path_appendnew(p, nparent, base, path, pathlen, mode, oid);
for (i = 0; i < nparent; ++i) { for (i = 0; i < nparent; ++i) {
/* /*