[PATCH 2/5] branch: factor out "upstream is not a branch" error messages

From

Jeff King <peff@peff.net>

Date

Apr 2, 2013, 19:03 UTC

Message-ID

<20130402190355.GB32316@sigill.intra.peff.net>

In-Reply-To

<20130402190134.GA17784@sigill.intra.peff.net>

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

Signed-off-by: Jeff King <peff@peff.net>
---
 branch.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/branch.c b/branch.c
index 2bef1e7..1acbd4e 100644
--- a/branch.c
+++ b/branch.c
@@ -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,
@@ -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;
 		}

-- 
1.8.2.rc0.33.gd915649