undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In add --patch, Handle K,k,J,j slightly more gracefully.

Browse Source 
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:
William Pursell 2008-11-27 04:08:03 +00:00 committed by Junio C Hamano
parent dd971cc9d6
commit ace30ba813
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
git-add--interactive.perl
View File

@ -1039,30 +1039,43 @@ sub patch_update_file {
$ix = $iy; $ix = $iy;
next; next;
} }
elsif ($other =~ /K/ && $line =~ /^K/) { elsif ($line =~ /^K/) {
$ix--; if ($other =~ /K/) {
next;
}
elsif ($other =~ /J/ && $line =~ /^J/) {
$ix++;
next;
}
elsif ($other =~ /k/ && $line =~ /^k/) {
while (1) {
$ix--; $ix--;
last if (!$ix || }
!defined $hunk[$ix]{USE}); else {
print STDERR "No previous hunk\n";
} }
next; next;
} }
elsif ($other =~ /j/ && $line =~ /^j/) { elsif ($line =~ /^J/) {
while (1) { if ($other =~ /J/) {
$ix++; $ix++;
last if ($ix >= $num || }
!defined $hunk[$ix]{USE}); else {
print STDERR "No next hunk\n";
} }
next; 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/) { elsif ($other =~ /s/ && $line =~ /^s/) {
my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY}); my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
if (1 < @split) { if (1 < @split) {