summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-12 22:31:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-12 22:31:40 (GMT)
commit23c0956441a101b2e8eca7e063e71bdc69a0c415 (patch)
treecc8f83322d27d0576c94f63f0c26f6386c8932fb /builtin
parent0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8 (diff)
parent00a6fa0720283b93eb011adcfea850fe21345548 (diff)
downloadgit-23c0956441a101b2e8eca7e063e71bdc69a0c415.zip
git-23c0956441a101b2e8eca7e063e71bdc69a0c415.tar.gz
git-23c0956441a101b2e8eca7e063e71bdc69a0c415.tar.bz2
Merge branch 'jk/push-simple'
Git 2.0 was supposed to make the "simple" mode for the default of "git push", but it didn't. * jk/push-simple: push: truly use "simple" as default, not "upstream"
Diffstat (limited to 'builtin')
-rw-r--r--builtin/push.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/push.c b/builtin/push.c
index cfa20c2..12f5e69 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -161,7 +161,7 @@ static const char message_detached_head_die[] =
" git push %s HEAD:<name-of-remote-branch>\n");
static void setup_push_upstream(struct remote *remote, struct branch *branch,
- int triangular)
+ int triangular, int simple)
{
struct strbuf refspec = STRBUF_INIT;
@@ -184,7 +184,7 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch,
"to update which remote branch."),
remote->name, branch->name);
- if (push_default == PUSH_DEFAULT_SIMPLE) {
+ if (simple) {
/* Additional safety */
if (strcmp(branch->refname, branch->merge[0]->src))
die_push_simple(branch, remote);
@@ -257,11 +257,11 @@ static void setup_default_push_refspecs(struct remote *remote)
if (triangular)
setup_push_current(remote, branch);
else
- setup_push_upstream(remote, branch, triangular);
+ setup_push_upstream(remote, branch, triangular, 1);
break;
case PUSH_DEFAULT_UPSTREAM:
- setup_push_upstream(remote, branch, triangular);
+ setup_push_upstream(remote, branch, triangular, 0);
break;
case PUSH_DEFAULT_CURRENT: