From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Leandro Lucarella <leandro.lucarella@sociomantic.com>
Subject: [PATCH 0/4] Fix triangular workflows for upstream, simple
Date: Sun, 9 Jun 2013 22:43:16 +0530 [thread overview]
Message-ID: <1370798000-2358-1-git-send-email-artagnon@gmail.com> (raw)
Junio C Hamano wrote:
> It might be a beginning of a change in the right direction (I didn't
> check the codeflow), but given that the test that comes after the
> one you removed is looking at branch->merge[0] and deciding what to
> do, and branch.$name.merge should *never* affect anything when
> remote.pushdefault or branch.$name.pushremote is in use while
> deciding what is pushed out or if the push is allowed, I do not
> think the removal of these five lines alone can possibly "work".
I just spent hours breaking my head thinking about why you said my
patch cannot possibly "work". I give up.
The artificial limitation was introduced by you in 135dade, and here's
the relevant part of the commit message:
- The current branch does have its remote and upstream branch configured,
but the user said "git push $there", where $there is not the remote
named by "branch.$name.remote". By definition, no branch at repository
$there is set to integrate with the current branch in this case, and
this push is not meant to update any branch at the remote repository
$there.
What definition is this, and why does it only apply to
upstream/simple? Did you implicitly assume that upstream/simple are
only meant to be used in centralized workflows?
Thanks.
Ramkumar Ramachandra (4):
t/push-default: remove redundant test_config lines
push: make upstream, simple work with pushdefault
t/push-default: generalize test_push_{success, commit}
t/push-default: test pushdefault with all modes
builtin/push.c | 5 -----
t/t5528-push-default.sh | 30 ++++++++++++++++++++++++------
2 files changed, 24 insertions(+), 11 deletions(-)
--
1.8.3.247.g485169c
next reply other threads:[~2013-06-09 17:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-09 17:13 Ramkumar Ramachandra [this message]
2013-06-09 17:13 ` [PATCH 1/4] t/push-default: remove redundant test_config lines Ramkumar Ramachandra
2013-06-09 17:13 ` [PATCH 2/4] push: make upstream, simple work with pushdefault Ramkumar Ramachandra
2013-06-09 22:51 ` Junio C Hamano
2013-06-10 8:43 ` Ramkumar Ramachandra
2013-06-10 9:37 ` Junio C Hamano
2013-06-10 11:48 ` Ramkumar Ramachandra
2013-06-10 15:47 ` Junio C Hamano
2013-06-10 16:07 ` Ramkumar Ramachandra
2013-06-10 19:09 ` Junio C Hamano
2013-06-13 9:10 ` Ramkumar Ramachandra
2013-06-13 16:48 ` Junio C Hamano
2013-06-13 17:39 ` Junio C Hamano
2013-06-13 17:45 ` Ramkumar Ramachandra
2013-06-09 17:13 ` [PATCH 3/4] t/push-default: generalize test_push_{success, commit} Ramkumar Ramachandra
2013-06-09 17:13 ` [PATCH 4/4] t/push-default: test pushdefault with all modes Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370798000-2358-1-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=leandro.lucarella@sociomantic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).