Re: [PATCH] push: Provide situational hints for non-fast-forward errors

On Fri, Mar 16, 2012 at 02:53:42PM -0700, Junio C Hamano wrote:

Clemens Buchacher [off-list ref] writes:

quoted

On Fri, Mar 16, 2012 at 05:03:58AM -0700, Junio C Hamano wrote:

quoted

Clemens Buchacher [off-list ref] writes:
...

quoted

quoted

+static const char message_advice_use_upstream[] =
+	N_("Some of your local branches were stale with respect to their\n"
+	   "remote counterparts. If you did not intend to push these branches,\n"
+	   "you may want to set the 'push.default' configuration variable to\n"
+	   "'current' or 'upstream' to push only the current branch.");
+
+static const char message_advice_checkout_pull_push[] =
+	N_("Updates were rejected because the tip of some of your branches are\n"
+	   "behind the remote. Check out the branch and merge the remote\n"
+	   "changes (e.g. 'git pull') before pushing again. See the\n"
+	   "'Note about fast-forwards' section of 'git push --help'\n"
+	   "for details.");

...
Sorry if I did not express myself well. I should have deleted the first
message. I was not talking about the case where the current branch is
rejected. I mean the two cases where other branches are rejected.

Oh, I see.  My reply ended up being very similar, though ;-)

I am afraid we are still not talking about the same thing...