Re: Pull without fetch

2019-04-11 Thread Damien Robert
First, let me thank you for your very thorough review! >From Junio C Hamano, Tue 09 Apr 2019 at 17:03:12 (+0900) : > It may be better to present the whole remedy, not just this new > piece that is an ingredient of it, i.e. > Teach a new --no-fetch option to `git pull`, so that the old >

Re: Pull without fetch

2019-04-09 Thread Junio C Hamano
Damien Robert writes: > In the good old days `git pull` was essentially `git fetch` followed by > `git merge FETCH_HEAD` so it was easy to separate the fetching part from > the integrating part. > > But nowadays there are no easy way to do the integrating part of `git > pull`. Indeed, `git pull`

Re: Pull without fetch

2019-04-08 Thread Damien Robert
>From Damien Robert, Mon 08 Apr 2019 at 16:53:40 (+0200) : > > Others may have a better idea, but I do not immediately see any > > solution better than inventing a new option to "git pull". So here is a RFC patch that implements --no-fetch. (I am not sure about the wording of the documentation, an

Re: Pull without fetch

2019-04-08 Thread Damien Robert
>From Junio C Hamano, Mon 08 Apr 2019 at 10:34:07 (+0900) : > In that simpler world, what you are trying to do would have been: > git fetch > # did I get anything worth integrating? > git merge FETCH_HEAD Indeed. > That obviously would not work for those with "pull.rebase", and

Re: Pull without fetch

2019-04-08 Thread Duy Nguyen
On Mon, Apr 8, 2019 at 7:51 PM Ævar Arnfjörð Bjarmason wrote: > > > On Mon, Apr 08 2019, Duy Nguyen wrote: > > > On Mon, Apr 8, 2019 at 8:34 AM Junio C Hamano wrote: > >> > >> Damien Robert writes: > >> > >> > is there a way to do a git pull without it running git fetch? > >> > Looking at the so

Re: Pull without fetch

2019-04-08 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 08 2019, Duy Nguyen wrote: > On Mon, Apr 8, 2019 at 8:34 AM Junio C Hamano wrote: >> >> Damien Robert writes: >> >> > is there a way to do a git pull without it running git fetch? >> > Looking at the source in builtin/pull.c does not seem to indicate so. >> >> The reason behind tha

Re: Pull without fetch

2019-04-07 Thread Duy Nguyen
On Mon, Apr 8, 2019 at 8:34 AM Junio C Hamano wrote: > > Damien Robert writes: > > > is there a way to do a git pull without it running git fetch? > > Looking at the source in builtin/pull.c does not seem to indicate so. > > The reason behind that is because it does not make any sense for > "pull

Re: Pull without fetch

2019-04-07 Thread Junio C Hamano
Damien Robert writes: > is there a way to do a git pull without it running git fetch? > Looking at the source in builtin/pull.c does not seem to indicate so. The reason behind that is because it does not make any sense for "pull", which is meant as a quick short-cut to say "fetch && merge", not

Pull without fetch

2019-04-06 Thread Damien Robert
Dear git developpers, is there a way to do a git pull without it running git fetch? Looking at the source in builtin/pull.c does not seem to indicate so. Here is my use case: I do a `git fetch --all` to look at the incoming changes, and only afterwards I would like to do a `git pull --no-fetch`.