diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:51 -0700 |
| commit | faadedb19538a9968dd2d607bcab00be1916bd31 (patch) | |
| tree | 8636f755fa6b929248d66075040e6b98a51e047b /t | |
| parent | Merge branch 'bw/protocol-v2' (diff) | |
| parent | add: do not accept pathspec magic 'attr' (diff) | |
| download | tgif-faadedb19538a9968dd2d607bcab00be1916bd31.tar.xz | |
Merge branch 'nd/attr-pathspec-fix'
"git add ':(attr:foo)'" is not supported and is supposed to be
rejected while the command line arguments are parsed, but we fail
to reject such a command line upfront.
* nd/attr-pathspec-fix:
add: do not accept pathspec magic 'attr'
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6135-pathspec-with-attrs.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6135-pathspec-with-attrs.sh b/t/t6135-pathspec-with-attrs.sh index 77b8cef661..e436a73962 100755 --- a/t/t6135-pathspec-with-attrs.sh +++ b/t/t6135-pathspec-with-attrs.sh @@ -166,7 +166,7 @@ test_expect_success 'fail if attr magic is used places not implemented' ' # though, but git-add is convenient as it has its own internal pathspec # parsing. test_must_fail git add ":(attr:labelB)" 2>actual && - test_i18ngrep "unsupported magic" actual + test_i18ngrep "magic not supported" actual ' test_expect_success 'abort on giving invalid label on the command line' ' |