Skip to content

Commit d4008bc

Browse files
committed
fast-import: align some error messages with git branch
We do not write "GIT" in all caps anymore, and we do translate error messages. The error messages when a ref needs to be created and it fails either because the ref name is invalid or because the ref already exists should be identical to the ones `git branch` emits. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 6fd0f02 commit d4008bc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

builtin/fast-import.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,9 @@ static struct branch *new_branch(const char *name)
613613
struct branch *b = lookup_branch(name);
614614

615615
if (b)
616-
die("Invalid attempt to create duplicate branch: %s", name);
616+
die(_("a branch named '%s' already exists"), name);
617617
if (check_refname_format(name, REFNAME_ALLOW_ONELEVEL))
618-
die("Branch name doesn't conform to GIT standards: %s", name);
618+
die(_("'%s' is not a valid branch name"), name);
619619

620620
b = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct branch));
621621
b->name = mem_pool_strdup(&fi_mem_pool, name);

0 commit comments

Comments
 (0)