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

Add 'g' command to go to a hunk

Browse Source 
When a minor change is made while the working directory is in a bit of a
mess, it is somewhat difficult to wade through all of the hunks using git
add --patch.  This allows one to jump to the hunk that needs to be staged
without having to respond 'n' to each preceding hunk.

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-12-04 10:22:40 +00:00 committed by Junio C Hamano
parent 3f6aff6889
commit 070434d02b
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
git-add--interactive.perl
View File

@ -800,6 +800,7 @@ y - stage this hunk
n - do not stage this hunk n - do not stage this hunk
a - stage this and all the remaining hunks in the file a - stage this and all the remaining hunks in the file
d - do not stage this hunk nor any of the remaining hunks in the file d - do not stage this hunk nor any of the remaining hunks in the file
g - select a hunk to go to
j - leave this hunk undecided, see next undecided hunk j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk k - leave this hunk undecided, see previous undecided hunk
@ -945,6 +946,9 @@ sub patch_update_file {
if ($ix < $num - 1) { if ($ix < $num - 1) {
$other .= '/J'; $other .= '/J';
} }
if ($num > 1) {
$other .= '/g';
}
for ($i = 0; $i < $num; $i++) { for ($i = 0; $i < $num; $i++) {
if (!defined $hunk[$i]{USE}) { if (!defined $hunk[$i]{USE}) {
$undecided = 1; $undecided = 1;
@ -978,6 +982,28 @@ sub patch_update_file {
} }
next; next;
} }
elsif ($other =~ /g/ && $line =~ /^g(.*)/) {
my $response = $1;
my $no = $ix > 10 ? $ix - 10 : 0;
while ($response eq '') {
my $extra = "";
$no = display_hunks(\@hunk, $no);
if ($no < $num) {
$extra = " (<ret> to see more)";
}
print "go to which hunk$extra? ";
$response = <STDIN>;
chomp $response;
}
if ($response !~ /^\s*\d+\s*$/) {
print STDERR "Invalid number: '$response'\n";
} elsif (0 < $response && $response <= $num) {
$ix = $response - 1;
} else {
print STDERR "Sorry, only $num hunks available.\n";
}
next;
}
elsif ($line =~ /^d/i) { elsif ($line =~ /^d/i) {
while ($ix < $num) { while ($ix < $num) {
if (!defined $hunk[$ix]{USE}) { if (!defined $hunk[$ix]{USE}) {