mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/push-default-advice'

Browse Source 
* mm/push-default-advice:
  push: better error message when no remote configured
  push: better error messages when push.default = tracking
This commit is contained in:
Junio C Hamano
2011-03-15 14:22:55 -07:00
parent e2bbfed10d a3f5e7a32e
commit bde7f7389f
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
builtin/push.c
View File

@ -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 strbuf refspec = STRBUF_INIT;
struct branch *branch = branch_get(NULL); struct branch *branch = branch_get(NULL);
if (!branch) 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) 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); branch->name);
if (branch->merge_nr != 1) if (branch->merge_nr != 1)
die("The current branch %s has multiple upstream branches, " die("The current branch %s has multiple upstream branches, "
@ -80,7 +90,7 @@ static void setup_push_upstream(void)
add_refspec(refspec.buf); add_refspec(refspec.buf);
} }
static void setup_default_push_refspecs(void) static void setup_default_push_refspecs(struct remote *remote)
{ {
switch (push_default) { switch (push_default) {
default: default:
@ -89,7 +99,7 @@ static void setup_default_push_refspecs(void)
break; break;
case PUSH_DEFAULT_UPSTREAM: case PUSH_DEFAULT_UPSTREAM:
setup_push_upstream(); setup_push_upstream(remote);
break; break;
case PUSH_DEFAULT_CURRENT: case PUSH_DEFAULT_CURRENT:
@ -147,7 +157,14 @@ static int do_push(const char *repo, int flags)
if (!remote) { if (!remote) {
if (repo) if (repo)
die("bad repository '%s'", repo); die("bad repository '%s'", repo);
die("No destination configured to push to."); die("No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
"and then push using the remote name\n"
"\n"
" git push <name>\n");
} }
if (remote->mirror) if (remote->mirror)
@ -175,7 +192,7 @@ static int do_push(const char *repo, int flags)
refspec = remote->push_refspec; refspec = remote->push_refspec;
refspec_nr = remote->push_refspec_nr; refspec_nr = remote->push_refspec_nr;
} else if (!(flags & TRANSPORT_PUSH_MIRROR)) } else if (!(flags & TRANSPORT_PUSH_MIRROR))
setup_default_push_refspecs(); setup_default_push_refspecs(remote);
} }
errs = 0; errs = 0;
if (remote->pushurl_nr) { if (remote->pushurl_nr) {