Re: [PATCH 1/1] git-add--interactive.perl: Add progress counter in the prompt
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 25, 2019, 15:38 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1909251736190.15067@tvgsbejvaqbjf.bet>
- In-Reply-To
- <8edf23f816dc0546fb3b5812573d7a759184206b.1569223612.git.gitgitgadget@gmail.com>
Hi,
On Mon, 23 Sep 2019, Kunal Tyagi via GitGitGadget wrote:
> From: Kunal Tyagi <tyagi.kunal@live.com> > > Signed-off-by: Kunal Tyagi <tyagi.kunal@live.com>
Could you move most (if not all) of the explanation from the cover letter (read: the PR description) into the commit message?
The patch looks good, I just have one suggestion:
Show 15 quoted lines
> ---
> git-add--interactive.perl | 2 +-
> t/t3701-add-interactive.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-add--interactive.perl b/git-add--interactive.perl
> index c20ae9e210..3951c25a28 100755
> --- a/git-add--interactive.perl
> +++ b/git-add--interactive.perl
> @@ -1541,7 +1541,7 @@ sub patch_update_file {
> for (@{$hunk[$ix]{DISPLAY}}) {
> print;
> }
> - print colored $prompt_color,
> + print colored $prompt_color,"(", $ix+1, "/$num) ",It would probably make sense to use `.` rather than `,`, the dot is the concatenation operator in Perl.
Thanks, Johannes
Show 19 quoted lines
> sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other);
>
> my $line = prompt_single_character;
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> index 69991a3168..3a2d9fb607 100755
> --- a/t/t3701-add-interactive.sh
> +++ b/t/t3701-add-interactive.sh
> @@ -314,7 +314,7 @@ test_expect_success C_LOCALE_OUTPUT 'add first line works' '
> git commit -am "clear local changes" &&
> git apply patch &&
> printf "%s\n" s y y | git add -p file 2>error |
> - sed -n -e "s/^Stage this hunk[^@]*\(@@ .*\)/\1/" \
> + sed -n -e "s/^(.*) Stage this hunk[^@]*\(@@ .*\)/\1/" \
> -e "/^[-+@ \\\\]"/p >output &&
> test_must_be_empty error &&
> git diff --cached >diff &&
> --
> gitgitgadget
>