Make git-add -i accept ranges like 7-

git-add -i ranges expect number-number. But for the supremely lazy, typing in
that second number when selecting "from patch 7 to the end" is wasted effort.
So treat an empty second number in a range as "until the last item".

Signed-off-by: Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index b8e3fa67598037bc5d0de30818b977048bbada72..815864c37fb42dd6c859253aa219685fca242f47 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -187,8 +187,9 @@ update::
    "Update>>".  When the prompt ends with double '>>', you can
    make more than one selection, concatenated with whitespace or
    comma.  Also you can say ranges.  E.g. "2-5 7,9" to choose
    "Update>>".  When the prompt ends with double '>>', you can
    make more than one selection, concatenated with whitespace or
    comma.  Also you can say ranges.  E.g. "2-5 7,9" to choose

-   2,3,4,5,7,9 from the list.  You can say '*' to choose
-   everything.
+   2,3,4,5,7,9 from the list.  If the second number in a range is
+   omitted, all remaining patches are taken.  E.g. "7-" to choose
+   7,8,9 from the list.  You can say '*' to choose everything.

 +
 What you chose are then highlighted with '*',
 like this:
 +
 What you chose are then highlighted with '*',
 like this:

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 903953e68e98535e754b5a5dd6ba22eb6074ef20..709caa9055e139731bedd8b4e0b2659df6017bfa 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -394,9 +394,9 @@ sub list_and_choose {
                        if ($choice =~ s/^-//) {
                                $choose = 0;
                        }
                        if ($choice =~ s/^-//) {
                                $choose = 0;
                        }

-                       # A range can be specified like 5-7
-                       if ($choice =~ /^(\d+)-(\d+)$/) {
-                               ($bottom, $top) = ($1, $2);
+                       # A range can be specified like 5-7 or 5-.
+                       if ($choice =~ /^(\d+)-(\d*)$/) {
+                               ($bottom, $top) = ($1, length($2) ? $2 : 1 + @stuff);

                        }
                        elsif ($choice =~ /^\d+$/) {
                                $bottom = $top = $choice;
                        }
                        elsif ($choice =~ /^\d+$/) {
                                $bottom = $top = $choice;