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

Merge branch 'gt/add-u-commit-i-pathspec-check'

Browse Source 
"git add -u <pathspec>" and "git commit [-i] <pathspec>" did not
diagnose a pathspec element that did not match any files in certain
situations, unlike "git add <pathspec>" did.

* gt/add-u-commit-i-pathspec-check:
  builtin/add: error out when passing untracked path with -u
  builtin/commit: error out when passing untracked path with -i
  revision: optionally record matches with pathspec elements
This commit is contained in:
Junio C Hamano
2024-04-15 14:11:43 -07:00
parent 6c142bc846 7de13cfef3
commit d75ec4c627
9 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/checkout.c
View File

@@ -882,7 +882,8 @@ static int merge_working_tree(const struct checkout_opts *opts,
* entries in the index.
*/
add_files_to_cache(the_repository, NULL, NULL, 0, 0);
add_files_to_cache(the_repository, NULL, NULL, NULL, 0,
0);
init_merge_options(&o, the_repository);
o.verbosity = 0;
work = write_in_core_index_as_tree(the_repository);