Re: [PATCH v2 09/19] pull: error on no merge candidates

On Wed, Jun 10, 2015 at 7:56 AM, Junio C Hamano wrote: > Paul Tan writes: > >> /** >> + * Appends merge candidates from FETCH_HEAD that are not marked >> not-for-merge >> + * into merge_heads. >> + */ > > Hmph, I vaguely recall doing that in C elsewhere already, even > though I do not remember

Re: [PATCH v2 09/19] pull: error on no merge candidates

Paul Tan writes: > /** > + * Appends merge candidates from FETCH_HEAD that are not marked not-for-merge > + * into merge_heads. > + */ Hmph, I vaguely recall doing that in C elsewhere already, even though I do not remember where offhand... > +static void get_merge_heads(struct sha1_array *merg

[PATCH v2 09/19] pull: error on no merge candidates

Commit a8c9bef (pull: improve advice for unconfigured error case, 2009-10-05) fully established the current advices given by git-pull for the different cases where git-fetch will not have anything marked for merge: 1. We fetched from a specific remote, and a refspec was given, but it ended up n