All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org, Fredrik Gustafsson <iveqy@iveqy.com>,
	Jens Lehmann <jens.lehmann@web.de>
Subject: Re: [PATCH v5 3/3] push: teach --recurse-submodules the on-demand option
Date: Mon, 26 Mar 2012 23:22:49 +0200	[thread overview]
Message-ID: <4F70DE29.6050808@in.waw.pl> (raw)
In-Reply-To: <20120213093008.GD15585@t1405.greatnet.de>

On 02/13/2012 10:30 AM, Heiko Voigt wrote:
> When using this option git will search for all submodules that
> have changed in the revisions to be send. It will then try to
> push the currently checked out branch of each submodule.
>
> This helps when a user has finished working on a change which
> involves submodules and just wants to push everything in one go.

> ---recurse-submodules=check::
> -	Check whether all submodule commits used by the revisions to be
> -	pushed are available on a remote tracking branch. Otherwise the
> -	push will be aborted and the command will exit with non-zero status.
> +--recurse-submodules=<check|on-demand>::
> +	Make sure all submodule commits used by the revisions to be
> +	pushed are available on a remote tracking branch. If check is
> +	used it will be checked that all submodule commits that changed
> +	in the revisions to be pushed are available on a remote.
> +	Otherwise the push will be aborted and exit with non-zero
> +	status. If on-demand is used all submodules that changed in the
> +	revisions to be pushed will be pushed. If on-demand was not able
> +	to push all necessary revisions it will also be aborted and exit
> +	with non-zero status.
Hi,
this desciption seems awkward. Not sure how to improve it, but:
- the argument 'check' is changed to '<check|on-demand>', i.e. brackets 
are added. This changes the meaning, because brackets are used around a 
name for a value provided by the user. So here brackets shouldn't be 
used, because 'check' and 'on-demand' are literals.
- s/if check is used it will be checked/if check is used git will verify 
that/
- s/a remote/the remote/
- s/Otherwise the push/If any commits are missing the push/ (because 
'Otherwise' could refer to 'If check is used'.)

Zbyszek

  parent reply	other threads:[~2012-03-26 21:23 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-13  9:25 [PATCH v5 0/3] push: submodule support Heiko Voigt
2012-02-13  9:27 ` [PATCH v5 1/3] Teach revision walking machinery to walk multiple times sequencially Heiko Voigt
2012-02-14  1:33   ` Junio C Hamano
2012-03-26 19:32     ` Heiko Voigt
2012-03-26 21:28       ` Junio C Hamano
2012-02-13  9:29 ` [PATCH v5 2/3] Refactor submodule push check to use string list instead of integer Heiko Voigt
2012-02-14  3:28   ` Junio C Hamano
2012-03-26 19:33     ` Heiko Voigt
2012-03-26 19:55       ` Heiko Voigt
2012-03-26 21:29         ` Junio C Hamano
2012-02-13  9:30 ` [PATCH v5 3/3] push: teach --recurse-submodules the on-demand option Heiko Voigt
2012-02-14  3:34   ` Junio C Hamano
2012-02-15 22:28     ` Jens Lehmann
2012-03-26 19:33       ` Heiko Voigt
2012-05-13 14:47       ` [RFC/PATCH] read from 2 filedescriptors simultaneously into one strbuf Heiko Voigt
2012-03-26 21:22   ` Zbigniew Jędrzejewski-Szmek [this message]
2012-03-28 15:30     ` [PATCH v5 3/3] push: teach --recurse-submodules the on-demand option Heiko Voigt

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=4F70DE29.6050808@in.waw.pl \
    --to=zbyszek@in.waw.pl \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hvoigt@hvoigt.net \
    --cc=iveqy@iveqy.com \
    --cc=jens.lehmann@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.