diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-01-30 14:17:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-30 14:17:10 -0800 |
| commit | f0940743facd619f251009e0307d8d6452cc582e (patch) | |
| tree | 2e2aa47257c3b6f3b1a55c842d0c5c9fcf21fd23 | |
| parent | Merge branch 'jk/test-fixes' (diff) | |
| parent | built-in add -i: accept open-ended ranges again (diff) | |
| download | tgif-f0940743facd619f251009e0307d8d6452cc582e.tar.xz | |
Merge branch 'js/builtin-add-i-cmds'
Minor bugfixes to "git add -i" that has recently been rewritten in C.
* js/builtin-add-i-cmds:
built-in add -i: accept open-ended ranges again
built-in add -i: do not try to `patch`/`diff` an empty list of files
| -rw-r--r-- | add-interactive.c | 9 | ||||
| -rwxr-xr-x | t/t3701-add-interactive.sh | 9 |
2 files changed, 15 insertions, 3 deletions
diff --git a/add-interactive.c b/add-interactive.c index 6a5048c83e..143e694724 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -326,7 +326,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; @@ -913,7 +916,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps, opts->prompt = N_("Patch update"); count = list_and_choose(s, files, opts); - if (count >= 0) { + if (count > 0) { struct argv_array args = ARGV_ARRAY_INIT; struct pathspec ps_selected = { 0 }; @@ -954,7 +957,7 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps, opts->flags = IMMEDIATE; count = list_and_choose(s, files, opts); opts->flags = 0; - if (count >= 0) { + if (count > 0) { struct argv_array args = ARGV_ARRAY_INIT; argv_array_pushl(&args, "git", "diff", "-p", "--cached", diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 12ee321707..2182b1c030 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -68,6 +68,15 @@ test_expect_success 'revert works (initial)' ' ! grep . output ' +test_expect_success 'add untracked (multiple)' ' + test_when_finished "git reset && rm [1-9]" && + touch $(test_seq 9) && + test_write_lines a "2-5 8-" | git add -i -- [1-9] && + test_write_lines 2 3 4 5 8 9 >expected && + git ls-files [1-9] >output && + test_cmp expected output +' + test_expect_success 'setup (commit)' ' echo baseline >file && git add file && |