Re: [PATCH v2 0/6] Support triangular workflows
Junio C Hamano wrote: > "Philip Oakley" writes: > >> Shouldn't Documentation/gitworkflows.txt also be updated with the >> triangular workflow and its configuration? > > What is missing from gitworkflows documentation is actually a > non-triangular workflow, where people pull from and push into the > same central repository. > > The "merge workflow" part in the "distributed workflows" section > teaches: > > * fetching others' work from and merging it to yours; > * publishing your work to ; and > * advertising your work. > > and it is written for the triangular workflow. > > Two triangles are involved. The maintainer may pull from you but > pushes to her own, which is one triangle, and you pull from the > maintainer and push to your own, which is another. > > As to your suggestion, I do think it is reasonable to clarify these > triangles with an illustration, and to even add descriptions for > short-cut configurations as a side note. I think the gitworkflows document should be rewritten with focus on setting up remotes and configuration variables for specific workflows. Once these are set up, pushing/ pulling (git pull is currently broken, although I'm working on fixing it) should Just Work. To push to a different remote/ refspec, the user can read the manpage of git push/ git pull. A workflow is about setting up good defaults that work 90% of the time with no additional effort. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/6] Support triangular workflows
"Philip Oakley" writes: > Shouldn't Documentation/gitworkflows.txt also be updated with the > triangular workflow and its configuration? What is missing from gitworkflows documentation is actually a non-triangular workflow, where people pull from and push into the same central repository. The "merge workflow" part in the "distributed workflows" section teaches: * fetching others' work from and merging it to yours; * publishing your work to ; and * advertising your work. and it is written for the triangular workflow. Two triangles are involved. The maintainer may pull from you but pushes to her own, which is one triangle, and you pull from the maintainer and push to your own, which is another. As to your suggestion, I do think it is reasonable to clarify these triangles with an illustration, and to even add descriptions for short-cut configurations as a side note. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/6] Support triangular workflows
Tay Ray Chuan wrote: > On Wed, Mar 20, 2013 at 8:44 PM, Ramkumar Ramachandra > wrote: >> remote.c: introduce remote.pushdefault >> remote.c: introduce branch..pushremote > > Perhaps we should clarify how this differs from remote.pushurl in the > documentation for it, in git-config and/or git-push. Maybe even > include the design decisions behind it from [1]. :) > > http://thread.gmane.org/gmane.comp.version-control.git/215702/focus=215717 Actually, it's quite obvious when you think about it: remote.pushurl doesn't allow remote tracking branches, and this is a very serious limitation. If anything, the documentation for remote.pushurl should be updated to explain that it has a very narrow usecase (will do in a future patch). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/6] Support triangular workflows
Philip Oakley wrote: > From: "Ramkumar Ramachandra" > Sent: Wednesday, March 20, 2013 12:44 PM > >> This follows-up [1], with three important differences: >> >> 1. pushremote_get() and remote_get() share code better. Thanks Jeff. >> >> 2. All spelling mistakes have been corrected. Thanks Eric. >> >> 3. One new test for each of the new configuration variables. The >> extra two parts [2/6] and [3/6] preprare the file for introducing >> tests. However, I've not gone overboard in this preparation; I don't >> replicate the work done by Jonathan in [2]. >> >> Thanks for reading. >> >> [1]: http://thread.gmane.org/gmane.comp.version-control.git/218410 >> [2]: >> http://thread.gmane.org/gmane.comp.version-control.git/218451/focus=218465 >> >> Ramkumar Ramachandra (6): >> remote.c: simplify a bit of code using git_config_string() >> t5516 (fetch-push): update test description >> t5516 (fetch-push): introduce mk_test_with_name() >> remote.c: introduce a way to have different remotes for fetch/push >> remote.c: introduce remote.pushdefault >> remote.c: introduce branch..pushremote >> >> Documentation/config.txt | 23 +++--- > > > Shouldn't Documentation/gitworkflows.txt also be updated with the triangular > workflow and its configuration? Currently, Documentation/gitworkflows.txt makes no effort to explain how to set up configuration variables for centralized or distributed workflows. I don't see how I could patch the existing document to include this workflow, without changing the entire structure of the document (left as an exercise for future patches). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/6] Support triangular workflows
From: "Ramkumar Ramachandra" Sent: Wednesday, March 20, 2013 12:44 PM This follows-up [1], with three important differences: 1. pushremote_get() and remote_get() share code better. Thanks Jeff. 2. All spelling mistakes have been corrected. Thanks Eric. 3. One new test for each of the new configuration variables. The extra two parts [2/6] and [3/6] preprare the file for introducing tests. However, I've not gone overboard in this preparation; I don't replicate the work done by Jonathan in [2]. Thanks for reading. [1]: http://thread.gmane.org/gmane.comp.version-control.git/218410 [2]: http://thread.gmane.org/gmane.comp.version-control.git/218451/focus=218465 Ramkumar Ramachandra (6): remote.c: simplify a bit of code using git_config_string() t5516 (fetch-push): update test description t5516 (fetch-push): introduce mk_test_with_name() remote.c: introduce a way to have different remotes for fetch/push remote.c: introduce remote.pushdefault remote.c: introduce branch..pushremote Documentation/config.txt | 23 +++--- Shouldn't Documentation/gitworkflows.txt also be updated with the triangular workflow and its configuration? builtin/push.c | 2 +- remote.c | 36 +-- remote.h | 1 + t/t5516-fetch-push.sh| 63 5 files changed, 104 insertions(+), 21 deletions(-) -- 1.8.2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/6] Support triangular workflows
On Wed, Mar 20, 2013 at 8:44 PM, Ramkumar Ramachandra wrote: > remote.c: introduce remote.pushdefault > remote.c: introduce branch..pushremote Perhaps we should clarify how this differs from remote.pushurl in the documentation for it, in git-config and/or git-push. Maybe even include the design decisions behind it from [1]. :) http://thread.gmane.org/gmane.comp.version-control.git/215702/focus=215717 -- Cheers, Ray Chuan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
