diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-01-16 08:33:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-16 22:10:23 (GMT) |
| commit | 849e43cc18a8aef639b92c5df9b66af3eb983b2a (patch) | |
| tree | e76e50354029b286d519c4e7a527a257b70c84aa /add-interactive.c | |
| parent | d660a30ceb9d8bd9940be82d240901c87999186b (diff) | |
| download | git-849e43cc18a8aef639b92c5df9b66af3eb983b2a.zip git-849e43cc18a8aef639b92c5df9b66af3eb983b2a.tar.gz git-849e43cc18a8aef639b92c5df9b66af3eb983b2a.tar.bz2 | |
built-in add -i: accept open-ended ranges again
The interactive `add` command allows selecting multiple files for some
of its sub-commands, via unique prefixes, indices or index ranges.
When re-implementing `git add -i` in C, we even added a code comment
talking about ranges with a missing end index, such as `2-`, but the
code did not actually accept those, as pointed out in
https://github.com/git-for-windows/git/issues/2466#issuecomment-574142760.
Let's fix this, and add a test case to verify that this stays fixed
forever.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'add-interactive.c')
| -rw-r--r-- | add-interactive.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/add-interactive.c b/add-interactive.c index 14d4688..396066e 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -328,7 +328,10 @@ static ssize_t list_and_choose(struct add_i_state *s, if (endp == p + sep) to = from + 1; else if (*endp == '-') { - to = strtoul(++endp, &endp, 10); + if (isdigit(*(++endp))) + to = strtoul(endp, &endp, 10); + else + to = items->items.nr; /* extra characters after the range? */ if (endp != p + sep) from = -1; |