mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/add-p-worktree-mode-prompt-fix'

Browse Source 
Fix another UI regression in the reimplemented "add -p".

* rs/add-p-worktree-mode-prompt-fix:
  add -p: fix worktree patch mode prompts
This commit is contained in:
Junio C Hamano
2022-09-15 16:09:46 -07:00
parent 5ff02db75b f6f0ee247f
commit b7f39a3fe6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
add-patch.c
View File

@ -191,10 +191,10 @@ static struct patch_mode patch_mode_worktree_head = {
.apply_check_args = { "-R", NULL }, .apply_check_args = { "-R", NULL },
.is_reverse = 1, .is_reverse = 1,
.prompt_mode = { .prompt_mode = {
N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "), N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "), N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
N_("Discard addition from index and worktree [y,n,q,a,d%s,?]? "), N_("Discard addition from worktree [y,n,q,a,d%s,?]? "),
N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "), N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
}, },
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for discarding."), "will immediately be marked for discarding."),
@ -213,10 +213,10 @@ static struct patch_mode patch_mode_worktree_nothead = {
.apply_args = { NULL }, .apply_args = { NULL },
.apply_check_args = { NULL }, .apply_check_args = { NULL },
.prompt_mode = { .prompt_mode = {
N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "), N_("Apply mode change to worktree [y,n,q,a,d%s,?]? "),
N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "), N_("Apply deletion to worktree [y,n,q,a,d%s,?]? "),
N_("Apply addition to index and worktree [y,n,q,a,d%s,?]? "), N_("Apply addition to worktree [y,n,q,a,d%s,?]? "),
N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "), N_("Apply this hunk to worktree [y,n,q,a,d%s,?]? "),
}, },
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for applying."), "will immediately be marked for applying."),