Re: [PATCH 2/2] reset: support the --stdin option

From

Jakub Narębski <jnareb@gmail.com>

Date

Oct 11, 2016, 20:49 UTC

Message-ID

<dc76476b-9ad5-a3b6-f12f-33cda2ca5814@gmail.com>

In-Reply-To

<2c7a52e43be710c7f37c4886629bda38df183c21.1476202100.git.johannes.schindelin@gmx.de>

W dniu 11.10.2016 o 18:09, Johannes Schindelin pisze:

>  SYNOPSIS
>  --------
>  [verse]
> -'git reset' [-q] [<tree-ish>] [--] <paths>...
> +'git reset' [-q] [--stdin [-z]] [<tree-ish>] [--] <paths>...

I think you meant here

  +'git reset' [-q] [--stdin [-z]] [<tree-ish>]

Because you say "*Instead*" below.

> +--stdin::
> +	Instead of taking list of paths from the command line,
> +	read list of paths from the standard input.  Paths are
> +	separated by LF (i.e. one path per line) by default.

And die if <paths> were supplied:

> +		if (pathspec.nr)
> +			die(_("--stdin is incompatible with path arguments"));

Of course you need to fix it in built-in synopsis as well:

> +	N_("git reset [-q] [--stdin [-z]] [<tree-ish>] [--] <paths>..."),
>  	N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),

-- 
Jakub Narębski