Re: [RFC PATCH 2/3] usage: prefix all lines in `vreportf()`, not just the first
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 28, 2018, 09:25 UTC
- Message-ID
- <xmqqin78jfnl.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <ef5b4e28e00ad0c95dbe625d2e7305957f9fe5ba.1527279322.git.martin.agren@gmail.com>
Martin Ågren <martin.agren@gmail.com> writes:
Show 16 quoted lines
> diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh > index 0c6f48f302..31b0702e6c 100755 > --- a/t/t1011-read-tree-sparse-checkout.sh > +++ b/t/t1011-read-tree-sparse-checkout.sh > @@ -243,9 +243,9 @@ test_expect_success 'print errors when failed to update worktree' ' > test_must_fail git checkout top 2>actual && > cat >expected <<\EOF && > error: The following untracked working tree files would be overwritten by checkout: > - sub/added > - sub/addedtoo > -Please move or remove them before you switch branches. > +error: sub/added > +error: sub/addedtoo > +error: Please move or remove them before you switch branches. > Aborting > EOF
This shows the typical effect of this series, which (I subjectively think) gives us a more pleasant end-user experience.
Show 11 quoted lines
> diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
> index 4ee009da66..80d35087b7 100755
> --- a/t/t1506-rev-parse-diagnosis.sh
> +++ b/t/t1506-rev-parse-diagnosis.sh
> @@ -11,7 +11,7 @@ test_did_you_mean ()
> sq="'" &&
> cat >expected <<-EOF &&
> fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}.
> - Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}?
> + fatal: Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}?
> EOFAnd this, too.
Show 11 quoted lines
> diff --git a/usage.c b/usage.c > index 80f9c1d14b..6a5669922f 100644 > --- a/usage.c > +++ b/usage.c > @@ -34,7 +34,7 @@ void vreportf(const char *prefix, const char *err, va_list params) > if (iscntrl(*p) && *p != '\t' && *p != '\n') > *p = '?'; > } > - fprintf(stderr, "%s%s\n", prefix, msg); > + prefix_suffix_lines(stderr, prefix, msg, ""); > }