From: Jordan DE GEA <jordan.de-gea@grenoble-inp.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Matthieu Moy <matthieu.moy@grenoble-inp.fr>,
Erwan Mathoniere <erwan.mathoniere@grenoble-inp.org>,
Tom Russello <tom.russello@grenoble-inp.org>,
Samuel Groot <samuel.groot@grenoble-inp.org>,
peff@peff.net, artagnon@gmail.com, philipoakley@iee.org
Subject: [RFC] Triangular Workflow UI improvement
Date: Mon, 30 May 2016 10:46:40 +0200 [thread overview]
Message-ID: <521237FA-0DC4-4C47-AB44-778888A7726F@grenoble-inp.org> (raw)
In-Reply-To: <xmqqwpmgvfif.fsf@gitster.mtv.corp.google.com>
>> We are working on full implementation of triangular workflow feature.
>> For now, the main options available are:
>> - branch.<name>.pushRemote
>> - remote.pushDefault
>> And only setable by hands.
>
> And once it is set, you do not have to worry about it. I am not
> sure per-branch thing is all that useful, unless you are always
> working on a single branch like 'master', but the latter would be
> just set once and forget about it.
We got the example of our fork of git(e.g. GitHub).
We want :
- some branches that only fetch from git/git and push to our/git
- the others branches fetch from and push to our/git.
For now, we have to change branch.<name>.remote and
branch.<name>.pushRemote(or remote.pushDefault).
With branch.<name>.fetchRemote, we only have to set this one.
fetchRemote is more explicit than remote for that case.
Another point is that many commands can erase the old
value of branch.<name>.remote.
>> Context:
>> - One main remote repository, e.g. git/git.
>> - A remote fork (e.g. a GitHub fork) of git/git, e.g. me/git.
>> - A local clone of me/git on the machine
>> Purposes:
>> - the local branch master has to fetch to git/git by default
>> - the local branch master has to push to me/git by default
>
> Wouldn't remote.pushDefault be the single thing you need to set just
> once and forget about it? Why would your users even want to do
> these things …
remote.pushDefault overrides branch.<name>.remote for all branches.
The goal is to give an easily understandable config for
complex configuration.
Having all the configuration in the same part (e.g [branch « master »])
is easier to understand and edit.
>
>> c. add `git fetch --set-default` in order to set remote.fetchDefault
>> d. add `git fetch --set-remote` in order to set branch.<name>.fetchRemote
>> e. add `git pull --set-default` in order to set remote.fetchDefault
>> f. add `git pull --set-remote` in order to set branch.<name>.fetchRemote
>> a. add `git push --set-default` in order to set remote.pushDefault
>> b. add `git push --set-remote` in order to set branch.<name>.pushRemote
>
> ... just to configure many variables every time they work on a new
> branch?
branch.<name>.pushRemote and all these options are optional.
Options in commands may not be added. It just gives user
friendly interaction with these options.
To conclude:
This feature is more about configuration clarity than possibility itself.
next prev parent reply other threads:[~2016-05-30 8:46 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-26 10:06 [RFC] Triangular Workflow: user friendly full implementation Jordan DE GEA
2016-05-26 11:04 ` Matthieu Moy
2016-05-26 18:30 ` Junio C Hamano
2016-05-30 8:46 ` Jordan DE GEA [this message]
2016-05-27 7:32 ` Philip Oakley
2016-05-30 9:07 ` [RFC] Triangular Workflow UI improvments Jordan DE GEA
2016-05-31 12:28 ` [RFC/PATCH] Triangular Workflow UI improvement: Documentation Jordan DE GEA
2016-05-31 14:33 ` Matthieu Moy
2016-06-01 9:32 ` Jordan DE GEA
2016-06-02 12:02 ` Michael Haggerty
2016-06-03 7:25 ` Philip Oakley
2016-06-03 9:52 ` Jordan DE GEA
2016-06-03 11:36 ` Matthieu Moy
2016-06-03 11:53 ` Jordan DE GEA
2016-06-05 21:28 ` Jordan DE GEA
2016-06-06 7:58 ` Matthieu Moy
2016-06-06 16:46 ` Philip Oakley
2016-06-06 16:54 ` Matthieu Moy
2016-06-06 19:21 ` Philip Oakley
2016-06-07 7:03 ` Matthieu Moy
2016-06-07 20:08 ` Philip Oakley
2016-06-03 15:46 ` Junio C Hamano
2016-06-03 22:16 ` Philip Oakley
2016-06-06 9:48 ` [RFC/PATCHv2] Documentation: triangular workflow Jordan DE GEA
2016-06-06 19:23 ` Junio C Hamano
2016-06-06 22:21 ` Philip Oakley
2016-06-07 6:58 ` Matthieu Moy
2016-06-07 8:02 ` Jordan DE GEA
2016-06-07 8:38 ` [PATCHv3] " Jordan DE GEA
2016-06-07 19:12 ` Junio C Hamano
2016-06-08 8:37 ` Jordan DE GEA
2016-06-08 13:20 ` Matthieu Moy
2016-06-09 12:35 ` [PATCHv4] " Jordan DE GEA
2016-06-09 17:02 ` Junio C Hamano
2016-06-11 15:58 ` Ramkumar Ramachandra
2016-06-11 19:31 ` Philip Oakley
2016-06-09 18:19 ` Philip Oakley
2016-06-10 16:47 ` Junio C Hamano
2016-06-11 19:25 ` Philip Oakley
2016-06-13 18:35 ` Junio C Hamano
2016-05-30 8:39 ` [RFC] Triangular Workflow UI improvement Jordan DE GEA
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=521237FA-0DC4-4C47-AB44-778888A7726F@grenoble-inp.org \
--to=jordan.de-gea@grenoble-inp.org \
--cc=artagnon@gmail.com \
--cc=erwan.mathoniere@grenoble-inp.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=matthieu.moy@grenoble-inp.fr \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=samuel.groot@grenoble-inp.org \
--cc=tom.russello@grenoble-inp.org \
/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).