undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref_transaction_commit(): delete extra "the" from error message

Browse Source 
While we are in the area, let's remove a superfluous definite article
from the error message that is emitted when the reference cannot be
locked. This improves how it reads and makes it a bit shorter.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
This commit is contained in:
Michael Haggerty 2015-05-11 17:25:19 +02:00 committed by Junio C Hamano
parent cbaabcbc6f
commit 3553944aa8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
refs.c
View File

@ -3844,7 +3844,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
? TRANSACTION_NAME_CONFLICT ? TRANSACTION_NAME_CONFLICT
: TRANSACTION_GENERIC_ERROR; : TRANSACTION_GENERIC_ERROR;
reason = strbuf_detach(err, NULL); reason = strbuf_detach(err, NULL);
strbuf_addf(err, "Cannot lock the ref '%s': %s", strbuf_addf(err, "Cannot lock ref '%s': %s",
update->refname, reason); update->refname, reason);
free(reason); free(reason);
goto cleanup; goto cleanup;

14
t/t1400-update-ref.sh
View File

@ -519,7 +519,7 @@ test_expect_success 'stdin create ref works with path with space to blob' '
test_expect_success 'stdin update ref fails with wrong old value' ' test_expect_success 'stdin update ref fails with wrong old value' '
echo "update $c $m $m~1" >stdin && echo "update $c $m $m~1" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && grep "fatal: Cannot lock ref '"'"'$c'"'"'" err &&
test_must_fail git rev-parse --verify -q $c test_must_fail git rev-parse --verify -q $c
' '
@ -555,7 +555,7 @@ test_expect_success 'stdin update ref works with right old value' '
test_expect_success 'stdin delete ref fails with wrong old value' ' test_expect_success 'stdin delete ref fails with wrong old value' '
echo "delete $a $m~1" >stdin && echo "delete $a $m~1" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err && test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: Cannot lock the ref '"'"'$a'"'"'" err && grep "fatal: Cannot lock ref '"'"'$a'"'"'" err &&
git rev-parse $m >expect && git rev-parse $m >expect &&
git rev-parse $a >actual && git rev-parse $a >actual &&
test_cmp expect actual test_cmp expect actual
@ -688,7 +688,7 @@ test_expect_success 'stdin update refs fails with wrong old value' '
update $c '' update $c ''
EOF EOF
test_must_fail git update-ref --stdin <stdin 2>err && test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && grep "fatal: Cannot lock ref '"'"'$c'"'"'" err &&
git rev-parse $m >expect && git rev-parse $m >expect &&
git rev-parse $a >actual && git rev-parse $a >actual &&
test_cmp expect actual && test_cmp expect actual &&
@ -883,7 +883,7 @@ test_expect_success 'stdin -z create ref works with path with space to blob' '
test_expect_success 'stdin -z update ref fails with wrong old value' ' test_expect_success 'stdin -z update ref fails with wrong old value' '
printf $F "update $c" "$m" "$m~1" >stdin && printf $F "update $c" "$m" "$m~1" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err && test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && grep "fatal: Cannot lock ref '"'"'$c'"'"'" err &&
test_must_fail git rev-parse --verify -q $c test_must_fail git rev-parse --verify -q $c
' '
@ -899,7 +899,7 @@ test_expect_success 'stdin -z create ref fails when ref exists' '
git rev-parse "$c" >expect && git rev-parse "$c" >expect &&
printf $F "create $c" "$m~1" >stdin && printf $F "create $c" "$m~1" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err && test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && grep "fatal: Cannot lock ref '"'"'$c'"'"'" err &&
git rev-parse "$c" >actual && git rev-parse "$c" >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -930,7 +930,7 @@ test_expect_success 'stdin -z update ref works with right old value' '
test_expect_success 'stdin -z delete ref fails with wrong old value' ' test_expect_success 'stdin -z delete ref fails with wrong old value' '
printf $F "delete $a" "$m~1" >stdin && printf $F "delete $a" "$m~1" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err && test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: Cannot lock the ref '"'"'$a'"'"'" err && grep "fatal: Cannot lock ref '"'"'$a'"'"'" err &&
git rev-parse $m >expect && git rev-parse $m >expect &&
git rev-parse $a >actual && git rev-parse $a >actual &&
test_cmp expect actual test_cmp expect actual
@ -1045,7 +1045,7 @@ test_expect_success 'stdin -z update refs fails with wrong old value' '
git update-ref $c $m && git update-ref $c $m &&
printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$m" "$Z" >stdin && printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$m" "$Z" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err && test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err && grep "fatal: Cannot lock ref '"'"'$c'"'"'" err &&
git rev-parse $m >expect && git rev-parse $m >expect &&
git rev-parse $a >actual && git rev-parse $a >actual &&
test_cmp expect actual && test_cmp expect actual &&