aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2025-01-09 03:42:48 -0500
committerJunio C Hamano <gitster@pobox.com>2025-01-09 12:24:24 -0800
commit30f7414ca17bc675105d3d731a827778d7367b11 (patch)
tree2761364a8b2dad78e3aac8286e1e387598c7265c /diff.h
parentcombine-diff: use pointer for parent paths (diff)
downloadgit-30f7414ca17bc675105d3d731a827778d7367b11.tar.gz
git-30f7414ca17bc675105d3d731a827778d7367b11.zip
diff: add a comment about combine_diff_path.parent.path
We only fill in the per-parent "path" field when it differs from what's in combine_diff_path.path (and even then only when the option is appropriate). Let's document that. Suggested-by: Wink Saville <wink@saville.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index f5f6ea00fb..60e7db4ad6 100644
--- a/diff.h
+++ b/diff.h
@@ -480,6 +480,12 @@ struct combine_diff_path {
char status;
unsigned int mode;
struct object_id oid;
+ /*
+ * This per-parent path is filled only when doing a combined
+ * diff with revs.combined_all_paths set, and only if the path
+ * differs from the post-image (e.g., a rename or copy).
+ * Otherwise it is left NULL.
+ */
char *path;
} parent[FLEX_ARRAY];
};