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

tree-diff: simplify emit_path() list management

Browse Source 
In emit_path() we may append a new combine_diff_path entry to our list,
decide that we don't want it (because opt->pathchange() told us so) and
then roll it back.

Between the addition and the rollback, it doesn't matter if it's in the
list or not (no functions can even tell, since it's a singly-linked list
and we pass around just the tail entry).

So it's much simpler to just wait until opt->pathchange() tells us
whether to keep it, and either attach it (or free it) then. We do still
have to allocate it up front since it's that struct itself which is
passed to the pathchange callback.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2025-01-09 03:54:05 -05:00
committed by Junio C Hamano
parent d8baf083c5
commit 6632bcba51
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tree-diff.c
View File

@ -177,14 +177,12 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *tail,
if (emitthis) { if (emitthis) {
int keep; int keep;
struct combine_diff_path *pprev = tail, *p; struct combine_diff_path *p;
strbuf_add(base, path, pathlen); strbuf_add(base, path, pathlen);
p = combine_diff_path_new(base->buf, base->len, mode, p = combine_diff_path_new(base->buf, base->len, mode,
oid ? oid : null_oid(), oid ? oid : null_oid(),
nparent); nparent);
tail->next = p;
tail = p;
strbuf_setlen(base, old_baselen); strbuf_setlen(base, old_baselen);
for (i = 0; i < nparent; ++i) { for (i = 0; i < nparent; ++i) {
@ -220,10 +218,11 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *tail,
if (opt->pathchange) if (opt->pathchange)
keep = opt->pathchange(opt, p); keep = opt->pathchange(opt, p);
if (!keep) { if (keep) {
tail->next = p;
tail = p;
} else {
free(p); free(p);
pprev->next = NULL;
tail = pprev;
} }
} }