From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Dec 2023 00:37:49 +0000 (-0800)
Subject: Merge branch 'jw/git-add-attr-pathspec'
X-Git-Tag: v2.44.0-rc0~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8b0ec44b13f7ee4dd6c8c726b5c105f66a51329;p=thirdparty%2Fgit.git

Merge branch 'jw/git-add-attr-pathspec'

"git add" and "git stash" learned to support the ":(attr:...)"
magic pathspec.

* jw/git-add-attr-pathspec:
  attr: enable attr pathspec magic for git-add and git-stash
---

d8b0ec44b13f7ee4dd6c8c726b5c105f66a51329
diff --cc t/t6135-pathspec-with-attrs.sh
index a9c1e4e0ec,e46fa176ed..00b84ecba6
--- a/t/t6135-pathspec-with-attrs.sh
+++ b/t/t6135-pathspec-with-attrs.sh
@@@ -236,19 -251,102 +251,102 @@@ test_expect_success 'check label exclud
  
  test_expect_success 'fail on multiple attr specifiers in one pathspec item' '
  	test_must_fail git ls-files . ":(attr:labelB,attr:labelC)" 2>actual &&
 -	test_i18ngrep "Only one" actual
 +	test_grep "Only one" actual
  '
  
- test_expect_success 'fail if attr magic is used places not implemented' '
+ test_expect_success 'fail if attr magic is used in places not implemented' '
  	# The main purpose of this test is to check that we actually fail
  	# when you attempt to use attr magic in commands that do not implement
- 	# attr magic. This test does not advocate git-add to stay that way,
- 	# though, but git-add is convenient as it has its own internal pathspec
- 	# parsing.
- 	test_must_fail git add ":(attr:labelB)" 2>actual &&
+ 	# attr magic. This test does not advocate check-ignore to stay that way.
+ 	# When you teach the command to grok the pathspec, you need to find
+ 	# another command to replace it for the test.
+ 	test_must_fail git check-ignore ":(attr:labelB)" 2>actual &&
 -	test_i18ngrep "magic not supported" actual
 +	test_grep "magic not supported" actual
  '
  
+ test_expect_success 'check that attr magic works for git stash push' '
+ 	cat <<-\EOF >expect &&
+ 	A	sub/newFileA-foo
+ 	EOF
+ 	>sub/newFileA-foo &&
+ 	>sub/newFileB-foo &&
+ 	git stash push --include-untracked -- ":(exclude,attr:labelB)" &&
+ 	git stash show --include-untracked --name-status >actual &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'check that attr magic works for git add --all' '
+ 	cat <<-\EOF >expect &&
+ 	sub/newFileA-foo
+ 	EOF
+ 	>sub/newFileA-foo &&
+ 	>sub/newFileB-foo &&
+ 	git add --all ":(exclude,attr:labelB)" &&
+ 	git diff --name-only --cached >actual &&
+ 	git restore -W -S . &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'check that attr magic works for git add -u' '
+ 	cat <<-\EOF >expect &&
+ 	sub/fileA
+ 	EOF
+ 	>sub/newFileA-foo &&
+ 	>sub/newFileB-foo &&
+ 	>sub/fileA &&
+ 	>sub/fileB &&
+ 	git add -u ":(exclude,attr:labelB)" &&
+ 	git diff --name-only --cached  >actual &&
+ 	git restore -S -W . && rm sub/new* &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'check that attr magic works for git add <path>' '
+ 	cat <<-\EOF >expect &&
+ 	fileA
+ 	fileB
+ 	sub/fileA
+ 	EOF
+ 	>fileA &&
+ 	>fileB &&
+ 	>sub/fileA &&
+ 	>sub/fileB &&
+ 	git add ":(exclude,attr:labelB)sub/*" &&
+ 	git diff --name-only --cached >actual &&
+ 	git restore -S -W . &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'check that attr magic works for git -add .' '
+ 	cat <<-\EOF >expect &&
+ 	sub/fileA
+ 	EOF
+ 	>fileA &&
+ 	>fileB &&
+ 	>sub/fileA &&
+ 	>sub/fileB &&
+ 	cd sub &&
+ 	git add . ":(exclude,attr:labelB)" &&
+ 	cd .. &&
+ 	git diff --name-only --cached >actual &&
+ 	git restore -S -W . &&
+ 	test_cmp expect actual
+ '
+ 
+ test_expect_success 'check that attr magic works for git add --pathspec-from-file' '
+ 	cat <<-\EOF >pathspec_file &&
+ 	:(exclude,attr:labelB)
+ 	EOF
+ 	cat <<-\EOF >expect &&
+ 	sub/newFileA-foo
+ 	EOF
+ 	>sub/newFileA-foo &&
+ 	>sub/newFileB-foo &&
+ 	git add --all --pathspec-from-file=pathspec_file &&
+ 	git diff --name-only --cached >actual &&
+ 	test_cmp expect actual
+ '
+ 
  test_expect_success 'abort on giving invalid label on the command line' '
  	test_must_fail git ls-files . ":(attr:☺)"
  '