Re: [PATCH v4 0/6] Support triangular workflows
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 28, 2013, 15:02 UTC
- Message-ID
- <7vppyjworw.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1364477202-5742-1-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 14 quoted lines
> The changes in this round are: > > 1. Peff submitted a patch to squash into [3/6]. Since his patch > essentially reverts mine, I've blamed him for the change. > > 2. Peff suggested a code movement in [5/6] to make things flow more > naturally. > > 3. Jonathan suggested a better test description in [2/6]. > > 4. Junio suggested a minor documentation update in [6/6]. > > My build of git has had this feature for two weeks now (since the > first iteration), and I'm very happy with it.
Will take a look; thanks for a reroll.
We may need a bit of adjustment to the longer term plan for the push.default topic, as I expect we will have this feature a lot sooner (e.g. perhaps in 1.8.4) than we will switch the push default to "simple". The description of simple and upstream still is written around the "you push to and pull from the same place", and may need to be updated to explain "what happens if you are employing a triangular workflow?" Or it could turn out that triangular people may be better served by a push.default different from simple or upstream.
Or it may turn out that we do not need any change to what is queued on the push-2.0-default-to-simple topic (I haven't thought things through).
It is not urgent, but please start thinking about how you can help, now you introduced the triangular stuff.
Thanks.
Show 16 quoted lines
> Jeff King (1): > t5516 (fetch-push): drop implicit arguments from helper functions > > Ramkumar Ramachandra (5): > remote.c: simplify a bit of code using git_config_string() > t5516 (fetch-push): update test description > remote.c: introduce a way to have different remotes for fetch/push > remote.c: introduce remote.pushdefault > remote.c: introduce branch.<name>.pushremote > > Documentation/config.txt | 24 +++- > builtin/push.c | 2 +- > remote.c | 41 ++++-- > remote.h | 1 + > t/t5516-fetch-push.sh | 316 +++++++++++++++++++++++++++-------------------- > 5 files changed, 238 insertions(+), 146 deletions(-)