[PATCH v1 2/3] add -p: allow line selection to be inverted

[Phillip Wood]

From: Phillip Wood <phillip.w...@dunelm.org.uk>

If the list of lines to be selected begins with '^' select all the
lines except the ones listed.

Signed-off-by: Phillip Wood <phillip.w...@dunelm.org.uk>
---
 git-add--interactive.perl  | 15 ++++++++++++++-
 t/t3701-add-interactive.sh |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 
8a33796e1f6a564d0a27ba06c216dbb9848827b9..0e3960b1ecf004bff51d28d540f685a5dc91fad1
 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1070,9 +1070,21 @@ sub check_hunk_label {
 sub parse_hunk_selection {
        local $_;
        my ($hunk, $line) = @_;
-       my $max_label = $hunk->{MAX_LABEL};
+       my ($max_label, $invert) = ($hunk->{MAX_LABEL}, undef);
        my @selected = (0) x ($max_label + 1);
        my @fields = split(/[,\s]+/, $line);
+       if ($fields[0] =~ /^\^(.*)/) {
+               $invert = 1;
+               if ($1 ne '') {
+                       $fields[0] = $1;
+               } else {
+                       shift @fields;
+                       unless (@fields) {
+                               error_msg __("no lines to invert\n");
+                               return undef;
+                       }
+               }
+       }
        for (@fields) {
                if (/^([0-9]*)-([0-9]*)$/) {
                        if ($1 eq '' and $2 eq '') {
@@ -1093,6 +1105,7 @@ sub parse_hunk_selection {
                        return undef;
                }
        }
+       $invert and @selected = map { !$_ } @selected;
        return \@selected;
 }
 
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 
caa80327c461785949eb2b9c919c253f4bef72cc..4ae706fd121f157e9cbd93ec293f45ce2a3a53b5
 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -390,7 +390,7 @@ test_expect_success 'setup expected diff' '
 '
 
 test_expect_success 'can reset individual lines of patch' '
-       printf "%s\n" l 2 |
+       printf "%s\n" l "^1 3" |
        EDITOR=: git reset -p 2>error &&
        test_must_be_empty error &&
        git diff --cached HEAD | sed /^index/d >actual &&
-- 
2.16.1