threads / patch / 46063

patchbranch test: fix invalid config key access

Subject: [PATCH] branch test: fix invalid config key access

## tl;dr

3 messages between May 28, 2017 and May 29, 2017. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Sahil Dua· May 28, 2017, 17:12 UTC · lore

Fixes the test by changing "branch.s/s/dummy" to "branch.s/s.dummy" which is the right way of accessing config key "branch.s/s.dummy". Purpose of this test is to confirm that this key doesn't exist after the branch "s/s" has been renamed to "s".

Earlier it was trying to access invalid config key and hence was getting an error. However, this wasn't caught because we were expecting the command to fail for other reason as mentioned above.

Signed-off-by: Sahil Dua <sahildua2305@gmail.com>
---
 t/t3200-branch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t3200-branch.sh +1 −1

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index fe62e7c..10f8f02 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -338,7 +338,7 @@ test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
 
 test_expect_success 'config information was renamed, too' '
 	test $(git config branch.s.dummy) = Hello &&
-	test_must_fail git config branch.s/s/dummy
+	test_must_fail git config branch.s/s.dummy
 '
 
 test_expect_success 'deleting a symref' '

-- 
2.7.4 (Apple Git-66)

Ævar Arnfjörð Bjarmason· May 28, 2017, 17:33 UTC · re: Sahil Dua · lore

Re: [PATCH] branch test: fix invalid config key access

On Sun, May 28, 2017 at 7:12 PM, Sahil Dua <sahildua2305@gmail.com> wrote:

Show 8 quoted lines

> Fixes the test by changing "branch.s/s/dummy" to "branch.s/s.dummy" which is
> the right way of accessing config key "branch.s/s.dummy". Purpose of
> this test is to confirm that this key doesn't exist after the branch
> "s/s" has been renamed to "s".
>
> Earlier it was trying to access invalid config key and hence was getting
> an error. However, this wasn't caught because we were expecting the
> command to fail for other reason as mentioned above.

Looks obviously correct to me. Added by Johannes in commit dc81c58cd6 ("git-branch: rename config vars branch.<branch>.*, too", 2006-12-16), CC-ing him in case he has anything to say about it, but just looks like a typo back in 2006.

Show 21 quoted lines

> Signed-off-by: Sahil Dua <sahildua2305@gmail.com>
> ---
>  t/t3200-branch.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index fe62e7c..10f8f02 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -338,7 +338,7 @@ test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
>
>  test_expect_success 'config information was renamed, too' '
>         test $(git config branch.s.dummy) = Hello &&
> -       test_must_fail git config branch.s/s/dummy
> +       test_must_fail git config branch.s/s.dummy
>  '
>
>  test_expect_success 'deleting a symref' '
> --
> 2.7.4 (Apple Git-66)
>

Junio C Hamano· May 29, 2017, 01:13 UTC · re: Ævar Arnfjörð Bjarmason · lore

Re: [PATCH] branch test: fix invalid config key access

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

Show 14 quoted lines

> On Sun, May 28, 2017 at 7:12 PM, Sahil Dua <sahildua2305@gmail.com> wrote:
>> Fixes the test by changing "branch.s/s/dummy" to "branch.s/s.dummy" which is
>> the right way of accessing config key "branch.s/s.dummy". Purpose of
>> this test is to confirm that this key doesn't exist after the branch
>> "s/s" has been renamed to "s".
>>
>> Earlier it was trying to access invalid config key and hence was getting
>> an error. However, this wasn't caught because we were expecting the
>> command to fail for other reason as mentioned above.
>
> Looks obviously correct to me. Added by Johannes in commit dc81c58cd6
> ("git-branch: rename config vars branch.<branch>.*, too", 2006-12-16),
> CC-ing him in case he has anything to say about it, but just looks
> like a typo back in 2006.

Yeah, it does look like a simple typo. Sorry for not spotting it back then.

Show 21 quoted lines

>> Signed-off-by: Sahil Dua <sahildua2305@gmail.com>
>> ---
>>  t/t3200-branch.sh | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
>> index fe62e7c..10f8f02 100755
>> --- a/t/t3200-branch.sh
>> +++ b/t/t3200-branch.sh
>> @@ -338,7 +338,7 @@ test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
>>
>>  test_expect_success 'config information was renamed, too' '
>>         test $(git config branch.s.dummy) = Hello &&
>> -       test_must_fail git config branch.s/s/dummy
>> +       test_must_fail git config branch.s/s.dummy
>>  '
>>
>>  test_expect_success 'deleting a symref' '
>> --
>> 2.7.4 (Apple Git-66)
>>