diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-25 14:13:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-25 14:13:32 -0700 |
| commit | 6b34ce90a748ff6bd679c29bc3f37a75a1bd3441 (patch) | |
| tree | 9e03790de15600b437eb2f43b1f2f2faa9964278 /t/t1430-bad-ref-name.sh | |
| parent | Sixth batch of topics for 2.10 (diff) | |
| parent | lock_ref_sha1_basic(): only handle REF_NODEREF mode (diff) | |
| download | tgif-6b34ce90a748ff6bd679c29bc3f37a75a1bd3441.tar.xz | |
Merge branch 'mh/split-under-lock'
Further preparatory work on the refs API before the pluggable
backend series can land.
* mh/split-under-lock: (33 commits)
lock_ref_sha1_basic(): only handle REF_NODEREF mode
commit_ref_update(): remove the flags parameter
lock_ref_for_update(): don't resolve symrefs
lock_ref_for_update(): don't re-read non-symbolic references
refs: resolve symbolic refs first
ref_transaction_update(): check refname_is_safe() at a minimum
unlock_ref(): move definition higher in the file
lock_ref_for_update(): new function
add_update(): initialize the whole ref_update
verify_refname_available(): adjust constness in declaration
refs: don't dereference on rename
refs: allow log-only updates
delete_branches(): use resolve_refdup()
ref_transaction_commit(): correctly report close_ref() failure
ref_transaction_create(): disallow recursive pruning
refs: make error messages more consistent
lock_ref_sha1_basic(): remove unneeded local variable
read_raw_ref(): move docstring to header file
read_raw_ref(): improve docstring
read_raw_ref(): rename symref argument to referent
...
Diffstat (limited to 't/t1430-bad-ref-name.sh')
| -rwxr-xr-x | t/t1430-bad-ref-name.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index 25ddab4e98..8937e25e49 100755 --- a/t/t1430-bad-ref-name.sh +++ b/t/t1430-bad-ref-name.sh @@ -285,7 +285,7 @@ test_expect_success 'update-ref -d cannot delete non-ref in .git dir' ' echo precious >expect && test_must_fail git update-ref -d my-private-file >output 2>error && test_must_be_empty output && - test_i18ngrep -e "cannot lock .*: unable to resolve reference" error && + test_i18ngrep -e "refusing to update ref with bad name" error && test_cmp expect .git/my-private-file ' |