From ace30ba813ed723534c3b4d223db6eddea417de7 Mon Sep 17 00:00:00 2001 From: William Pursell Date: Thu, 27 Nov 2008 04:08:03 +0000 Subject: In add --patch, Handle K,k,J,j slightly more gracefully. Instead of printing the help menu, this will print "No next hunk" and then process the given hunk again. Signed-off-by: William Pursell Signed-off-by: Junio C Hamano --- git-add--interactive.perl | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) (limited to 'git-add--interactive.perl') diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 64ad28998..30ddab293 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1039,29 +1039,42 @@ sub patch_update_file { $ix = $iy; next; } - elsif ($other =~ /K/ && $line =~ /^K/) { - $ix--; + elsif ($line =~ /^K/) { + if ($other =~ /K/) { + $ix--; + } + else { + print STDERR "No previous hunk\n"; + } next; } - elsif ($other =~ /J/ && $line =~ /^J/) { - $ix++; + elsif ($line =~ /^J/) { + if ($other =~ /J/) { + $ix++; + } + else { + print STDERR "No next hunk\n"; + } next; } - elsif ($other =~ /k/ && $line =~ /^k/) { - while (1) { - $ix--; - last if (!$ix || - !defined $hunk[$ix]{USE}); + elsif ($line =~ /^k/) { + if ($other =~ /k/) { + while (1) { + $ix--; + last if (!$ix || + !defined $hunk[$ix]{USE}); + } + } + else { + print STDERR "No previous hunk\n"; } next; } - elsif ($other =~ /j/ && $line =~ /^j/) { - while (1) { - $ix++; - last if ($ix >= $num || - !defined $hunk[$ix]{USE}); + elsif ($line =~ /^j/) { + if ($other !~ /j/) { + print STDERR "No next hunk\n"; + next; } - next; } elsif ($other =~ /s/ && $line =~ /^s/) { my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY}); -- cgit v1.2.1