Re: [RFC/PATCH v2] pull: add --set-upstream

2016-06-07 Thread Erwan Mathoniere
On 06/06/2016 18:29, Philip Oakley wrote: + that each one tracks the remote branch pulled from. If a configuration + already exists, it is overwriten. For example, with `git pull -u origin + branch` the current branch will track `branch` from `origin`. ++ +If two or more branches are pulled on

Re: [RFC/PATCH v2] pull: add --set-upstream

2016-06-07 Thread Erwan Mathoniere
On 06/06/2016 21:06, Junio C Hamano wrote: But I am unhappy with a more serious problem with the tests in this patch. They assume that "-u" option will forever be the only thing that is allowed to modify the configuration during "git pull -u". It should never make such an assumption. The onl

Re: [RFC/PATCH v2] pull: add --set-upstream

2016-06-07 Thread Erwan Mathoniere
On 07/06/2016 09:06, Matthieu Moy wrote: Junio C Hamano writes: Matthieu Moy writes: +test_config_unchanged () { + git config --list --local >original + "$@" + git config --list --local >modified + test_cmp original modified +} The test passes if "$@" fails. You

Re: [RFC/PATCH v2] pull: add --set-upstream

2016-06-07 Thread Erwan Mathoniere
On 06/06/2016 17:54, Matthieu Moy wrote: Erwan Mathoniere writes: @@ -497,6 +504,10 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs fprintf(stderr, "\n"); fprintf_ln(stderr, _("If you wish to set tracking

[RFC/PATCH v2] pull: add --set-upstream

2016-06-06 Thread Erwan Mathoniere
`git branch --set-upstream-to` to set upstream can be quite confusing. Using this `git pull --set-upstream` is easier and more natural. Signed-off-by: Erwan Mathoniere Signed-off-by: Jordan De Gea Signed-off-by: Matthieu Moy --- Changes from v1: - Code reshaped to : * warn + no-op when pulling

[PATCH] Documentation: bold literals in man

2016-05-31 Thread Erwan Mathoniere
occur. Remove `MAN_BOLD_LITERAL`. Set by default literals as bold. Implement `NO_MAN_BOLD_LITERAL`, a new Makefile option, disabling this feature when defined. Signed-off-by: Erwan MATHONIERE Signed-off-by: Samuel GROOT Signed-off-by: Tom RUSSELLO Signed-off-by: Matthieu MOY --- Documentation

Re: [RFC/PATCH] pull: set-upstream implementation

2016-05-29 Thread Erwan Mathoniere
On 25/05/2016 20:09, Junio C Hamano wrote: > Erwan Mathoniere writes: >> Difficulties: >> - I can't figure out what remote branch sould be tracked >> in that case: `git pull -u origin :master` > > What does the command do without "-u"? Aft

[RFC/PATCH] pull: set-upstream implementation

2016-05-25 Thread Erwan Mathoniere
Implements pull [--set-upstream | -u] which sets the remote tracking branch to the one the user just pulled from. git pull [--set-upstream | -u] After successfully fetched from , sets branch..remote to and branch..merge to follow / Signed-off-by: Erwan Mathoniere Signed-off-by

Students contributing to Git

2016-05-15 Thread Erwan Mathoniere
Hello Git community, We're a group of french students from Grenoble INP - Ensimag. As part of an academic project, mentored by Matthieu Moy, we chose to spend the four next weeks contributing to Git. We're now picking ideas in order to help the community the most effective way and we're eager to

Students contributing to Git

2016-05-15 Thread Erwan Mathoniere
Hello Git community, We're a group of french students from Grenoble INP - Ensimag. As part of an academic project, mentored by Matthieu Moy, we chose to spend the four next weeks contributing to Git. We're now picking ideas in order to help the community the most effective way and we're eager to