diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-03-16 10:13:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-16 12:08:32 -0700 |
| commit | 4fa64a54f4c6dd3e1ec05b95e40823d081e2d238 (patch) | |
| tree | 3285196ef3710845473a1c6dd6039d9137491393 | |
| parent | 7d4860bc5349bd769222f652e7cdc78d603943e5 (diff) | |
| download | git-4fa64a54f4c6dd3e1ec05b95e40823d081e2d238.tar.gz | |
add -p: allow line selection to be inverted
If the list of lines to be selected begins with '-' select all the
lines except the ones listed.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-add.txt | 3 | ||||
| -rwxr-xr-x | git-add--interactive.perl | 17 | ||||
| -rwxr-xr-x | t/t3701-add-interactive.sh | 2 |
3 files changed, 19 insertions, 3 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 965e192a09..01ff4d7d24 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -342,7 +342,8 @@ deletion labelled with a number and you will be prompted to enter which lines you wish to select. Individual line numbers should be separated by a space or comma, to specify a range of lines use a dash between them. If the upper bound of a range of lines is omitted it defaults to -the last line. +the last line. To invert the selection prefix it with "-" so "-3-5,8" +will select everything except lines 3, 4, 5 and 8. + After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks. diff --git a/git-add--interactive.perl b/git-add--interactive.perl index d8131d9a0a..8bc0626f0e 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1085,9 +1085,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 (my ($lo, $hi) = /^([0-9]+)-([0-9]*)$/) { if ($hi eq '') { @@ -1107,6 +1119,9 @@ sub parse_hunk_selection { return undef; } } + if ($invert) { + @selected = map { !$_ } @selected; + } return \@selected; } diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 6d8f17c61a..c1703725f2 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -410,7 +410,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 >actual && |