Skip to content

Commit f6f0ee2

Browse files
rscharfegitster
authored andcommitted
add -p: fix worktree patch mode prompts
cee6cb7 (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 2f0896e (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. 2c8bd84 (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 <[email protected]> Signed-off-by: René Scharfe <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a0feb86 commit f6f0ee2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

add-patch.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ static struct patch_mode patch_mode_worktree_head = {
191191
.apply_check_args = { "-R", NULL },
192192
.is_reverse = 1,
193193
.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,?]? "),
198198
},
199199
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
200200
"will immediately be marked for discarding."),
@@ -213,10 +213,10 @@ static struct patch_mode patch_mode_worktree_nothead = {
213213
.apply_args = { NULL },
214214
.apply_check_args = { NULL },
215215
.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,?]? "),
220220
},
221221
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
222222
"will immediately be marked for applying."),

0 commit comments

Comments
 (0)