mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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 <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
dd971cc9d6
commit
ace30ba813
|
@ -1039,30 +1039,43 @@ sub patch_update_file {
|
|||
$ix = $iy;
|
||||
next;
|
||||
}
|
||||
elsif ($other =~ /K/ && $line =~ /^K/) {
|
||||
$ix--;
|
||||
next;
|
||||
}
|
||||
elsif ($other =~ /J/ && $line =~ /^J/) {
|
||||
$ix++;
|
||||
next;
|
||||
}
|
||||
elsif ($other =~ /k/ && $line =~ /^k/) {
|
||||
while (1) {
|
||||
elsif ($line =~ /^K/) {
|
||||
if ($other =~ /K/) {
|
||||
$ix--;
|
||||
last if (!$ix ||
|
||||
!defined $hunk[$ix]{USE});
|
||||
}
|
||||
else {
|
||||
print STDERR "No previous hunk\n";
|
||||
}
|
||||
next;
|
||||
}
|
||||
elsif ($other =~ /j/ && $line =~ /^j/) {
|
||||
while (1) {
|
||||
elsif ($line =~ /^J/) {
|
||||
if ($other =~ /J/) {
|
||||
$ix++;
|
||||
last if ($ix >= $num ||
|
||||
!defined $hunk[$ix]{USE});
|
||||
}
|
||||
else {
|
||||
print STDERR "No next hunk\n";
|
||||
}
|
||||
next;
|
||||
}
|
||||
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 ($line =~ /^j/) {
|
||||
if ($other !~ /j/) {
|
||||
print STDERR "No next hunk\n";
|
||||
next;
|
||||
}
|
||||
}
|
||||
elsif ($other =~ /s/ && $line =~ /^s/) {
|
||||
my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
|
||||
if (1 < @split) {
|
||||
|
|
Loading…
Reference in a new issue