public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Junio C Hamano <gitster@pobox•com>
Cc: Jonathan Nieder <jrnieder@gmail•com>,
	git@vger•kernel.org, Jeff King <peff@peff•net>
Subject: Re: [PATCH] push: error out when the "upstream" semantics does not make sense
Date: Thu, 05 Apr 2012 22:24:06 +0200	[thread overview]
Message-ID: <vpqsjgi53mh.fsf@bauges.imag.fr> (raw)
In-Reply-To: <7vhawy54nd.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 05 Apr 2012 13:01:58 -0700")

Junio C Hamano <gitster@pobox•com> writes:

>  		die(_("You are pushing to remote '%s', which is not the "
> -		      "upstream of your\ncurrent branch '%s'.\n"),
> +		      "upstream of your\ncurrent branch '%s',\n"
> +		      "without telling me to push which local branch to\n"
> +		      " update which remote branch with."),

Sounds overly complex sentence to me. "without telling me what to push"
sounded good enough without being long, so I prefered it.

I like accompanying these messages with the way out for the user, so
perhaps we can add stg like

"To push the current branch to this remote, run:

  git push <remote> <branch>

"

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  parent reply	other threads:[~2012-04-05 20:24 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-04 23:26 What's cooking in git.git (Apr 2012, #02; Wed, 4) Junio C Hamano
2012-04-05 12:47 ` Jeff King
2012-04-05 16:00   ` [PATCH] push: error out when the "upstream" semantics does not make sense Junio C Hamano
2012-04-05 18:43     ` Jonathan Nieder
2012-04-05 19:48       ` Junio C Hamano
2012-04-05 19:58         ` Jonathan Nieder
2012-04-05 20:01         ` Junio C Hamano
2012-04-05 20:23           ` Jonathan Nieder
2012-04-05 20:24           ` Matthieu Moy [this message]
2012-04-05 20:34             ` Junio C Hamano
2012-04-06  7:16               ` Matthieu Moy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpqsjgi53mh.fsf@bauges.imag.fr \
    --to=matthieu.moy@grenoble-inp$(echo .)fr \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    --cc=jrnieder@gmail$(echo .)com \
    --cc=peff@peff$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox