@matheusbsbs / matheus-bagliano / commits / f6f0ee247f

add -p: fix worktree patch mode prompts

cee6cb7300 (built-in add -p: implement the "worktree" patch modes, 2019-12-21) added the worktree patch modes to the built-in add -p. Its commit message claims to be a port of 2f0896ec3ad4 (restore: support --patch, 2019-04-25), which did the same for the script git-add--interactive.perl. The script mentioned only the worktree in its prompt messages in worktree mode, while the built-in mentions the worktree and also the index, even though the command doesn't actually affect the index. 2c8bd8471a (checkout -p: handle new files correctly, 2020-05-27) added new prompt messages for addition that also mention the index in worktree mode in the built-in, but not in the script. Correct these prompts to state that only the worktree will be affected. Reported-by: David Plumpton <david.plumpton@gmail.com> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

René Scharfe committed Sep 14, 2022 at 11:47 UTC f6f0ee247f17194a52f445f865001de59ffa810f
1 file changed +8 -8
add-patch.c
+8 -8
@@ -191,10 +191,10 @@ static struct patch_mode patch_mode_worktree_head = {
191 .apply_check_args = { "-R", NULL },
192 .is_reverse = 1,
193 .prompt_mode = {
194 - N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
195 - N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
196 - N_("Discard addition from index and worktree [y,n,q,a,d%s,?]? "),
197 - N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
194 + N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
195 + N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
196 + N_("Discard addition from worktree [y,n,q,a,d%s,?]? "),
197 + N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
198 },
199 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
200 "will immediately be marked for discarding."),
@@ -213,10 +213,10 @@ static struct patch_mode patch_mode_worktree_nothead = {
213 .apply_args = { NULL },
214 .apply_check_args = { NULL },
215 .prompt_mode = {
216 - N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
217 - N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
218 - N_("Apply addition to index and worktree [y,n,q,a,d%s,?]? "),
219 - N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
216 + N_("Apply mode change to worktree [y,n,q,a,d%s,?]? "),
217 + N_("Apply deletion to worktree [y,n,q,a,d%s,?]? "),
218 + N_("Apply addition to worktree [y,n,q,a,d%s,?]? "),
219 + N_("Apply this hunk to worktree [y,n,q,a,d%s,?]? "),
220 },
221 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
222 "will immediately be marked for applying."),