global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 01:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/diff-index-find-copies-harder-optim'

Browse Source 
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()
This commit is contained in:
Junio C Hamano
2025-12-14 17:04:36 +09:00
parent 794c979889 38f88051da
commit 84ca5a2457
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
diff.c
View File

@@ -7399,6 +7399,26 @@ void diff_change(struct diff_options *options,
concatpath, old_dirty_submodule, new_dirty_submodule);
}
void diff_same(struct diff_options *options,
unsigned mode,
const struct object_id *oid,
const char *concatpath)
{
struct diff_filespec *one;
if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options))
return;
if (options->prefix &&
strncmp(concatpath, options->prefix, options->prefix_length))
return;
one = alloc_filespec(concatpath);
fill_filespec(one, oid, 1, mode);
one->count++;
diff_queue(&diff_queued_diff, one, one);
}
struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
{
struct diff_filepair *pair;