From 1a15d00bb910de0a86981f0d75836feac71d1fe0 Mon Sep 17 00:00:00 2001
From: Jeff King <peff@peff.net>
Date: Tue, 2 Apr 2013 15:04:51 -0400
Subject: [PATCH] branch: mention start_name in set-upstream error messages
If we refuse a branch operation because the tracking
start_name the user gave us is bogus, we just print
something like:
fatal: Cannot setup tracking information; start point is not a branch
If we mention the actual name we tried to use, that may help
the user figure out why it didn't work (e.g., if they gave
us the arguments in the wrong order).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
branch.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/branch.c b/branch.c
index 060e9e3cf88..d6f40015d7f 100644
--- a/branch.c
+++ b/branch.c
@@ -198,9 +198,9 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
}
static const char upstream_not_branch[] =
-N_("Cannot setup tracking information; starting point is not a branch.");
+N_("Cannot setup tracking information; starting point '%s' is not a branch.");
static const char upstream_missing[] =
-N_("Cannot setup tracking information; starting point does not exist");
+N_("Cannot setup tracking information; starting point '%s' does not exist");
void create_branch(const char *head,
const char *name, const char *start_name,
@@ -231,7 +231,7 @@ void create_branch(const char *head,
real_ref = NULL;
if (get_sha1(start_name, sha1)) {
if (explicit_tracking)
- die(_(upstream_missing));
+ die(_(upstream_missing), start_name);
die("Not a valid object name: '%s'.", start_name);
}
@@ -239,14 +239,14 @@ void create_branch(const char *head,
case 0:
/* Not branching from any existing branch */
if (explicit_tracking)
- die(_(upstream_not_branch));
+ die(_(upstream_not_branch), start_name);
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(_(upstream_not_branch));
+ die(_(upstream_not_branch), start_name);
else
real_ref = NULL;
}