Christopher Tiwald <christiwald@xxxxxxxxx> writes:
> + /* Branches configured for octopus merges should advise
> + * just 'git pull' */
Style: Git usually writes these comments
/*
* like this
*/
> + if (branch->remote_name &&
> + branch->merge &&
> + branch->merge_nr == 1 &&
> + !strcmp(transport->remote->name, branch->remote_name) &&
> + !strcmp(strbuf_detach(&buf, NULL),
> + prettify_refname(branch->merge[0]->dst))) {
> + advise_tracked_pull_before_push();
> + }
> + else
> + advise_untracked_pull_before_push();
Isn't this doing the opposite of what the comment is saying about
octopus merge, i.e. if branch->merge_nr > 1, call
advise_untracked_pull_before_push() which will advise 'git pull <remote>
<branch>'?
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html