diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2023-05-20 08:44:08 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2023-05-20 08:44:08 +0800 |
| commit | 68a86d028b9cd53886b8fa5239a5daebc566f21c (patch) | |
| tree | 7b629def3a66c5dc2aa17cb87d1f4b2a7569e76e /t/t0003-attributes.sh | |
| parent | 03d05937a70900819a5a73583a96bcb1fd06eb68 (diff) | |
| parent | 9e49351c3060e1fa6e0d2de64505b7becf157f28 (diff) | |
| download | git-68a86d028b9cd53886b8fa5239a5daebc566f21c.tar.gz | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git:
A few more topics after 2.41-rc1
Git 2.41-rc1
t/lib-httpd: make CGIPassAuth support conditional
t9001: mark the script as no longer leak checker clean
send-email: clear the $message_id after validation
upload-pack: advertise capabilities when cloning empty repos
A bit more before -rc1
imap-send: include strbuf.h
run-command.c: fix missing include under `NO_PTHREADS`
test: do not negate test_path_is_* to assert absense
t2021: do not negate test_path_is_dir
tests: do not negate test_path_exists
doc/git-config: add unit for http.lowSpeedLimit
rebase -r: fix the total number shown in the progress
rebase --update-refs: fix loops
attr: teach "--attr-source=<tree>" global option to "git"
Diffstat (limited to 't/t0003-attributes.sh')
| -rwxr-xr-x | t/t0003-attributes.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 89b306cb11..26e082f05b 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -30,8 +30,17 @@ attr_check_quote () { attr_check_source () { path="$1" expect="$2" source="$3" git_opts="$4" && - git $git_opts check-attr --source $source test -- "$path" >actual 2>err && echo "$path: test: $expect" >expect && + + git $git_opts check-attr --source $source test -- "$path" >actual 2>err && + test_cmp expect actual && + test_must_be_empty err && + + git $git_opts --attr-source="$source" check-attr test -- "$path" >actual 2>err && + test_cmp expect actual && + test_must_be_empty err + + GIT_ATTR_SOURCE="$source" git $git_opts check-attr test -- "$path" >actual 2>err && test_cmp expect actual && test_must_be_empty err } |