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

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>

diff --git a/refs.c b/refs.c
index ecaf80499e888a4d645a34ba3bff4d46a9769f09..bc4b1ab8b71b2d2e740426494a5b6fababb84bd0 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -3844,7 +3844,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
                                ? TRANSACTION_NAME_CONFLICT
                                : TRANSACTION_GENERIC_ERROR;
                        reason = strbuf_detach(err, NULL);
                                ? TRANSACTION_NAME_CONFLICT
                                : TRANSACTION_GENERIC_ERROR;
                        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);
                        free(reason);
                        goto cleanup;
                                    update->refname, reason);
                        free(reason);
                        goto cleanup;

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 6805b9e6bb5b7e6a6b6b9546e96023ebeb557bd0..86fa46856c47aecfc9901039cc868253b896156f 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -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' '
        echo "update $c $m $m~1" >stdin &&
        test_must_fail git update-ref --stdin <stdin 2>err &&
 test_expect_success 'stdin update ref fails with wrong old value' '
        echo "update $c $m $m~1" >stdin &&
        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' '
        echo "delete $a $m~1" >stdin &&
        test_must_fail git update-ref --stdin <stdin 2>err &&
 test_expect_success 'stdin delete ref fails with wrong old value' '
        echo "delete $a $m~1" >stdin &&
        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 $a >actual &&
        test_cmp expect actual
        git rev-parse $m >expect &&
        git rev-parse $a >actual &&
        test_cmp expect actual


@@ -688,7 +688,7 @@ test_expect_success 'stdin update refs fails with wrong old value' '
        update $c  ''
        EOF
        test_must_fail git update-ref --stdin <stdin 2>err &&
        update $c  ''
        EOF
        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 $a >actual &&
        test_cmp expect actual &&
        git rev-parse $m >expect &&
        git rev-parse $a >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' '
        printf $F "update $c" "$m" "$m~1" >stdin &&
        test_must_fail git update-ref -z --stdin <stdin 2>err &&
 test_expect_success 'stdin -z update ref fails with wrong old value' '
        printf $F "update $c" "$m" "$m~1" >stdin &&
        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 &&
        printf $F "create $c" "$m~1" >stdin &&
        test_must_fail git update-ref -z --stdin <stdin 2>err &&
        git rev-parse "$c" >expect &&
        printf $F "create $c" "$m~1" >stdin &&
        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 &&
        test_cmp expect actual
 '
        git rev-parse "$c" >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' '
        printf $F "delete $a" "$m~1" >stdin &&
        test_must_fail git update-ref -z --stdin <stdin 2>err &&
 test_expect_success 'stdin -z delete ref fails with wrong old value' '
        printf $F "delete $a" "$m~1" >stdin &&
        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 $a >actual &&
        test_cmp expect actual
        git rev-parse $m >expect &&
        git rev-parse $a >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 &&
        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 &&
        git update-ref $c $m &&
        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 &&

-       grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err &&
+       grep "fatal: Cannot lock ref '"'"'$c'"'"'" err &&

        git rev-parse $m >expect &&
        git rev-parse $a >actual &&
        test_cmp expect actual &&
        git rev-parse $m >expect &&
        git rev-parse $a >actual &&
        test_cmp expect actual &&