summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2011-03-02 20:12:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-02 23:34:23 (GMT)
commitec8460bd91007f0bd7851cd07494d1019a39937f (patch)
tree94314b0a24baccec8da26cc39a0f5a75b5a85600 /builtin/push.c
parent8978166e531e0941811099d4117574ebbbcf35d8 (diff)
downloadgit-ec8460bd91007f0bd7851cd07494d1019a39937f.zip
git-ec8460bd91007f0bd7851cd07494d1019a39937f.tar.gz
git-ec8460bd91007f0bd7851cd07494d1019a39937f.tar.bz2
push: better error messages when push.default = tracking
A common scenario is to create a new branch and push it (checkout -b && push [--set-upstream]). In this case, the user was getting "The current branch %s has no upstream branch.", which doesn't help much. Provide the user a command to push the current branch. To avoid the situation in the future, suggest --set-upstream. While we're there, also improve the error message in the "detached HEAD" case. We mention explicitly "detached HEAD" since this is the keyword to look for in documentations. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 31da418..1b493fb 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -64,14 +64,24 @@ static void set_refspecs(const char **refs, int nr)
}
}
-static void setup_push_upstream(void)
+static void setup_push_upstream(struct remote *remote)
{
struct strbuf refspec = STRBUF_INIT;
struct branch *branch = branch_get(NULL);
if (!branch)
- die("You are not currently on a branch.");
+ die("You are not currently on a branch.\n"
+ "To push the history leading to the current (detached HEAD)\n"
+ "state now, use\n"
+ "\n"
+ " git push %s HEAD:<name-of-remote-branch>\n",
+ remote->name);
if (!branch->merge_nr || !branch->merge)
- die("The current branch %s has no upstream branch.",
+ die("The current branch %s has no upstream branch.\n"
+ "To push the current branch and set the remote as upstream, use\n"
+ "\n"
+ " git push --set-upstream %s %s\n",
+ branch->name,
+ remote->name,
branch->name);
if (branch->merge_nr != 1)
die("The current branch %s has multiple upstream branches, "
@@ -80,7 +90,7 @@ static void setup_push_upstream(void)
add_refspec(refspec.buf);
}
-static void setup_default_push_refspecs(void)
+static void setup_default_push_refspecs(struct remote *remote)
{
switch (push_default) {
default:
@@ -89,7 +99,7 @@ static void setup_default_push_refspecs(void)
break;
case PUSH_DEFAULT_UPSTREAM:
- setup_push_upstream();
+ setup_push_upstream(remote);
break;
case PUSH_DEFAULT_CURRENT:
@@ -175,7 +185,7 @@ static int do_push(const char *repo, int flags)
refspec = remote->push_refspec;
refspec_nr = remote->push_refspec_nr;
} else if (!(flags & TRANSPORT_PUSH_MIRROR))
- setup_default_push_refspecs();
+ setup_default_push_refspecs(remote);
}
errs = 0;
if (remote->pushurl_nr) {