diff options
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-x | git-add--interactive.perl | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 8bc0626f0e..86e373a101 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1082,6 +1082,29 @@ sub check_hunk_label { return 1; } +sub split_hunk_selection { + local $_; + my @fields = @_; + my @ret; + for (@fields) { + while ($_ ne '') { + if (/^[0-9]-$/) { + push @ret, $_; + last; + } elsif (/^([0-9](?:-[0-9])?)(.*)/) { + push @ret, $1; + $_ = $2; + } else { + error_msg sprintf + __("invalid hunk line '%s'\n"), + substr($_, 0, 1); + return (); + } + } + } + return @ret; +} + sub parse_hunk_selection { local $_; my ($hunk, $line) = @_; @@ -1100,6 +1123,9 @@ sub parse_hunk_selection { } } } + if ($max_label < 10) { + @fields = split_hunk_selection(@fields) or return undef; + } for (@fields) { if (my ($lo, $hi) = /^([0-9]+)-([0-9]*)$/) { if ($hi eq '') { |