Re: [PATCH] pull: fail early if we know we can't merge from upstream

2013-04-12 Thread Junio C Hamano
Carlos Martín Nieto writes: > On Thu, 2013-04-11 at 10:37 -0700, Junio C Hamano wrote: > >> > + fetch=$(git config --get-all "remote.$use_remote.fetch") >> > + if [ -z "$fetch" ]; then >> > + return >> > + fi >> >> Hmm, it is probably correct to punt on this case, but it defeats >> l

Re: [PATCH] pull: fail early if we know we can't merge from upstream

2013-04-12 Thread Carlos Martín Nieto
On Thu, 2013-04-11 at 10:37 -0700, Junio C Hamano wrote: > Carlos Martín Nieto writes: > > > I can't quite decide whether the behaviour of 'git pull' with no > > upstream configured but a default remote with no fetch refspecs > > merging the remote's HEAD is a feature, a bug or something in betwe

Re: [PATCH] pull: fail early if we know we can't merge from upstream

2013-04-11 Thread Junio C Hamano
Carlos Martín Nieto writes: > I can't quite decide whether the behaviour of 'git pull' with no > upstream configured but a default remote with no fetch refspecs > merging the remote's HEAD is a feature, a bug or something in between, > but it's used by t7409 so maybe someone else is using it and