mbox series

[v2,0/2] git: support separate arg for `--config-env`'s value

Message ID cover.1619700731.git.ps@pks.im (mailing list archive)
Headers show
Series git: support separate arg for `--config-env`'s value | expand

Message

Patrick Steinhardt April 29, 2021, 12:55 p.m. UTC
Hi,

this is the second version of this series fixing inconsistencies with
the `--config-env` parameter. It's only got a single change compared to
v1, which is to replace `test_i18ngrep` with `grep` as pointed out by
Ævar.

Patrick

Patrick Steinhardt (2):
  git.txt: fix synopsis of `--config-env` missing the equals sign
  git: support separate arg for `--config-env`'s value

 Documentation/git.txt |  2 +-
 git.c                 |  8 ++++++++
 t/t1300-config.sh     | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

Range-diff against v1:
1:  08049f3b10 = 1:  08049f3b10 git.txt: fix synopsis of `--config-env` missing the equals sign
2:  d52db89bc2 ! 2:  5264fb6fa7 git: support separate arg for `--config-env`'s value
    @@ t/t1300-config.sh: test_expect_success 'git --config-env=key=envvar support' '
      
     +test_expect_success 'git --config-env with missing value' '
     +	test_must_fail env ENVVAR=value git --config-env 2>error &&
    -+	test_i18ngrep "no config key given for --config-env" error &&
    ++	grep "no config key given for --config-env" error &&
     +	test_must_fail env ENVVAR=value git --config-env config core.name 2>error &&
    -+	test_i18ngrep "invalid config format: config" error
    ++	grep "invalid config format: config" error
     +'
     +
      test_expect_success 'git --config-env fails with invalid parameters' '

Comments

Jeff King April 29, 2021, 8:04 p.m. UTC | #1
On Thu, Apr 29, 2021 at 02:55:25PM +0200, Patrick Steinhardt wrote:

> this is the second version of this series fixing inconsistencies with
> the `--config-env` parameter. It's only got a single change compared to
> v1, which is to replace `test_i18ngrep` with `grep` as pointed out by
> Ævar.

Thanks, this version looks good to me.

-Peff
Junio C Hamano April 30, 2021, 12:47 a.m. UTC | #2
Jeff King <peff@peff.net> writes:

> On Thu, Apr 29, 2021 at 02:55:25PM +0200, Patrick Steinhardt wrote:
>
>> this is the second version of this series fixing inconsistencies with
>> the `--config-env` parameter. It's only got a single change compared to
>> v1, which is to replace `test_i18ngrep` with `grep` as pointed out by
>> Ævar.
>
> Thanks, this version looks good to me.
>
> -Peff

Thanks, will replace.