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

Merge branch 'ds/sparse-apply-add-p'

Browse Source 
"git apply" and "git add -i/-p" code paths no longer unnecessarily
expand sparse-index while working.

* ds/sparse-apply-add-p:
  p2000: add performance test for patch-mode commands
  reset: integrate sparse index with --patch
  git add: make -p/-i aware of sparse index
  apply: integrate with the sparse index
This commit is contained in:
Junio C Hamano
2025-05-27 13:59:09 -07:00
parent 6b6c366e79 ecf9ba20e3
commit 6e5fb398d3
5 changed files with 167 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/add.c
View File

@@ -390,6 +390,10 @@ int cmd_add(int argc,
argc = parse_options(argc, argv, prefix, builtin_add_options,
builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
prepare_repo_settings(repo);
repo->settings.command_requires_full_index = 0;
if (patch_interactive)
add_interactive = 1;
if (add_interactive) {
@@ -426,9 +430,6 @@ int cmd_add(int argc,
add_new_files = !take_worktree_changes && !refresh_only && !add_renormalize;
require_pathspec = !(take_worktree_changes || (0 < addremove_explicit));
prepare_repo_settings(repo);
repo->settings.command_requires_full_index = 0;
repo_hold_locked_index(repo, &lock_file, LOCK_DIE_ON_ERROR);
/*