Skip to content

Commit

Permalink
branch: factor out "upstream is not a branch" error messages
Browse files Browse the repository at this point in the history
This message is duplicated, and is quite long. Let's factor
it out, which avoids the repetition and the long lines. It
will also make future patches easier as we tweak the
message.

While we're at it, let's also mark it for translation.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Apr 2, 2013
1 parent 8a3e5ec commit e2b6aa5
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions branch.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
return 1;
}

static const char upstream_not_branch[] =
N_("Cannot setup tracking information; starting point is not a branch.");

void create_branch(const char *head,
const char *name, const char *start_name,
int force, int reflog, int clobber_head,
Expand Down Expand Up @@ -231,14 +234,14 @@ void create_branch(const char *head,
case 0:
/* Not branching from any existing branch */
if (explicit_tracking)
die("Cannot setup tracking information; starting point is not a branch.");
die(_(upstream_not_branch));
break;
case 1:
/* Unique completion -- good, only if it is a real branch */
if (prefixcmp(real_ref, "refs/heads/") &&
prefixcmp(real_ref, "refs/remotes/")) {
if (explicit_tracking)
die("Cannot setup tracking information; starting point is not a branch.");
die(_(upstream_not_branch));
else
real_ref = NULL;
}
Expand Down

0 comments on commit e2b6aa5

Please sign in to comment.