diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-05 23:34:58 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-05 23:34:58 +0100 |
| commit | 9a5315edfdf662c4d9bf444ebc297bc802fa5e04 (patch) | |
| tree | f5a719c28ba9445bd857be710a1955c5c4883634 /add-interactive.c | |
| parent | Merge branch 'dl/test-must-fail-fixes' (diff) | |
| parent | commit --interactive: make it work with the built-in `add -i` (diff) | |
| download | git-9a5315edfdf662c4d9bf444ebc297bc802fa5e04.tar.xz git-9a5315edfdf662c4d9bf444ebc297bc802fa5e04.zip | |
Merge branch 'js/patch-mode-in-others-in-c'
The effort to move "git-add--interactive" to C continues.
* js/patch-mode-in-others-in-c:
commit --interactive: make it work with the built-in `add -i`
built-in add -p: implement the "worktree" patch modes
built-in add -p: implement the "checkout" patch modes
built-in stash: use the built-in `git add -p` if so configured
legacy stash -p: respect the add.interactive.usebuiltin setting
built-in add -p: implement the "stash" and "reset" patch modes
built-in add -p: prepare for patch modes other than "stage"
Diffstat (limited to 'add-interactive.c')
| -rw-r--r-- | add-interactive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/add-interactive.c b/add-interactive.c index 143e694724..577cef3842 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -927,7 +927,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps, parse_pathspec(&ps_selected, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL, PATHSPEC_LITERAL_PATH, "", args.argv); - res = run_add_p(s->r, &ps_selected); + res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected); argv_array_clear(&args); clear_pathspec(&ps_selected); } |