Skip to content

Commit

Permalink
branches: fix error message for invalid name
Browse files Browse the repository at this point in the history
  • Loading branch information
yuangli committed Jul 11, 2022
1 parent 724b5a0 commit 7560ac4
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/branch.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ static int not_a_local_branch(const char *reference_name)

static bool branch_name_follows_pattern(const char *branch_name)
{
/*
* Discourage branch name starting with dash,
* https://github.com/git/git/commit/6348624010888b
* and discourage HEAD as branch name,
* https://github.com/git/git/commit/a625b092cc5994
*/
return branch_name[0] != '-' && git__strcmp(branch_name, "HEAD");
}

Expand All @@ -78,7 +84,7 @@ static int create_branch(
GIT_ASSERT_ARG(git_commit_owner(commit) == repository);

if (!branch_name_follows_pattern(branch_name)) {
git_error_set(GIT_ERROR_REFERENCE, "'HEAD' is not a valid branch name");
git_error_set(GIT_ERROR_REFERENCE, "'%s' is not a valid branch name", branch_name);
error = -1;
goto cleanup;
}
Expand Down Expand Up @@ -761,12 +767,6 @@ int git_branch_name_is_valid(int *valid, const char *name)

*valid = 0;

/*
* Discourage branch name starting with dash,
* https://github.com/git/git/commit/6348624010888b
* and discourage HEAD as branch name,
* https://github.com/git/git/commit/a625b092cc5994
*/
if (!name || !branch_name_follows_pattern(name))
goto done;

Expand Down

0 comments on commit 7560ac4

Please sign in to comment.