[PATCH 1/3] Change prompt separater from / to , in add --patch.
- From
William Pursell <bill.pursell@gmail.com>
- Date
- Nov 27, 2008, 04:07 UTC
- Message-ID
- <492E1D18.2090207@gmail.com>
To enable adding the '/' command as an option, it is advisable not to use '/' as the command separater.
Signed-off-by: William Pursell <bill.pursell@gmail.com> --- git-add--interactive.perl | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index b0223c3..f20b880 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -887,22 +887,22 @@ sub patch_update_file { for ($i = 0; $i < $ix; $i++) { if (!defined $hunk[$i]{USE}) { $prev = 1; - $other .= '/k'; + $other .= ',k'; last; } } if ($ix) { - $other .= '/K'; + $other .= ',K'; } for ($i = $ix + 1; $i < $num; $i++) { if (!defined $hunk[$i]{USE}) { $next = 1; - $other .= '/j'; + $other .= ',j'; last; } } if ($ix < $num - 1) { - $other .= '/J'; + $other .= ',J'; } for ($i = 0; $i < $num; $i++) { if (!defined $hunk[$i]{USE}) { @@ -913,13 +913,13 @@ sub patch_update_file { last if (!$undecided); if (hunk_splittable($hunk[$ix]{TEXT})) { - $other .= '/s'; + $other .= ',s'; } - $other .= '/e'; + $other .= ',e'; for (@{$hunk[$ix]{DISPLAY}}) { print; } - print colored $prompt_color, "Stage this hunk [y/n/a/d$other/?]? "; + print colored $prompt_color, "Stage this hunk [y,n,a,d$other,?]? "; my $line = <STDIN>; if ($line) { if ($line =~ /^y/i) {
-- 1.6.0.4.782.geea74.dirty -- William Pursell