aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-12-14 17:04:36 +0900
committerJunio C Hamano <gitster@pobox.com>2025-12-14 17:04:36 +0900
commit84ca5a2457757e8997ddcaa64e8c26372359965c (patch)
tree473ac74a8da8c8c4cc4b0de707c7179aea5674b3 /diff.h
parent794c9798893670dcf8f52952487217cb04a478c4 (diff)
parent38f88051dae6ddb2f1cdb9c7415d4ba6caef04af (diff)
downloadgit-84ca5a2457757e8997ddcaa64e8c26372359965c.tar.gz
Merge branch 'rs/diff-index-find-copies-harder-optim'
Halve the memory consumed by artificial filepairs created during "git diff --find-copioes-harder", also making the operation run faster. * rs/diff-index-find-copies-harder-optim: diff-index: don't queue unchanged filepairs with diff_change()
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index b3a4c6335b..7eb84aadf4 100644
--- a/diff.h
+++ b/diff.h
@@ -572,6 +572,11 @@ void diff_change(struct diff_options *,
const char *fullpath,
unsigned dirty_submodule1, unsigned dirty_submodule2);
+void diff_same(struct diff_options *,
+ unsigned mode,
+ const struct object_id *oid,
+ const char *fullpath);
+
struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat,