зеркало из https://github.com/microsoft/git.git
Merge branch 'jk/diff-memuse-optim-with-stat-unmatch'
Reduce memory usage during "diff --quiet" in a worktree with too many stat-unmatched paths. * jk/diff-memuse-optim-with-stat-unmatch: diff: discard blob data from stat-unmatched pairs
This commit is contained in:
Коммит
0cd0afc9c6
5
diff.c
5
diff.c
|
@ -6763,8 +6763,11 @@ void diff_change(struct diff_options *options,
|
|||
return;
|
||||
|
||||
if (options->flags.quick && options->skip_stat_unmatch &&
|
||||
!diff_filespec_check_stat_unmatch(options->repo, p))
|
||||
!diff_filespec_check_stat_unmatch(options->repo, p)) {
|
||||
diff_free_filespec_data(p->one);
|
||||
diff_free_filespec_data(p->two);
|
||||
return;
|
||||
}
|
||||
|
||||
options->flags.has_changes = 1;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче