diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:18:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:18:08 -0800 |
| commit | 0eeb9b86d686fb4f1f833890a6e5d880e7e78109 (patch) | |
| tree | bbc687843a8ca88771d28494f69abc1bba3daeee /builtin/push.c | |
| parent | e524fb497a0259cee4559f60d815218fc01ac466 (diff) | |
| parent | 00a6fa0720283b93eb011adcfea850fe21345548 (diff) | |
| download | git-0eeb9b86d686fb4f1f833890a6e5d880e7e78109.tar.gz | |
Merge branch 'jk/push-simple' into maint
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/push.c')
| -rw-r--r-- | builtin/push.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/push.c b/builtin/push.c index a076b1964d..7aedf6f533 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: |