mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/t5505-remote: test failure of set-head

Browse Source 
The test coverage was missing a test for the failure branch of remote
set-head auto's output. Add the missing text and while we are at it,
correct a small grammatical mistake in the error's output ("setup" is
the noun, "set up" is the verb).

Signed-off-by: Bence Ferdinandy <bence@ferdinandy.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Bence Ferdinandy
2024-11-22 13:28:43 +01:00
committed by Junio C Hamano
parent 54d820d7d4
commit 2fd5555895
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/remote.c
View File

@ -1445,7 +1445,7 @@ static int set_head(int argc, const char **argv, const char *prefix)
if (!refs_ref_exists(get_main_ref_store(the_repository), buf2.buf))
result |= error(_("Not a valid ref: %s"), buf2.buf);
else if (refs_update_symref(get_main_ref_store(the_repository), buf.buf, buf2.buf, "remote set-head"))
result |= error(_("Could not setup %s"), buf.buf);
result |= error(_("Could not set up %s"), buf.buf);
else if (opt_a)
printf("%s/HEAD set to %s\n", argv[0], head_name);
free(head_name);

12
t/t5505-remote.sh
View File

@ -432,6 +432,18 @@ test_expect_success 'set-head --auto' '
)
'
test_expect_success REFFILES 'set-head --auto failure' '
test_when_finished "rm -f test/.git/refs/remotes/origin/HEAD.lock" &&
(
cd test &&
touch .git/refs/remotes/origin/HEAD.lock &&
test_must_fail git remote set-head --auto origin 2>err &&
tail -n1 err >output &&
echo "error: Could not set up refs/remotes/origin/HEAD" >expect &&
test_cmp expect output
)
'
test_expect_success 'set-head --auto has no problem w/multiple HEADs' '
(
cd test &&