]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'gt/add-u-commit-i-pathspec-check'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2024 21:11:43 +0000 (14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2024 21:11:43 +0000 (14:11 -0700)
"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

1  2 
builtin/add.c
builtin/checkout.c
builtin/commit.c

diff --cc builtin/add.c
Simple merge
Simple merge
Simple merge