commit c37c2f0a725cab61f43b8fa90096814ca9f24e33 from: Stefan Sperling date: Tue Apr 30 15:40:10 2024 UTC make got stage -p behave the same way in interactive and -F modes for 'q' Lucas agrees commit - c3cc85a3c5ab8491266b207eeb1fb6b6061274ed commit + c37c2f0a725cab61f43b8fa90096814ca9f24e33 blob - 92d7198e1d1093296cd4b3a1cc0d49a6de2c3de5 blob + a08af5c4dae000dbd90f6463e972bc9fe726b1a5 --- got/got.c +++ got/got.c @@ -8683,11 +8683,10 @@ choose_patch(int *choice, void *arg, unsigned char sta continue; } - if (interactive) { - if (status != GOT_STATUS_MODIFY && line[0] == 'q') { - printf("invalid response '%s'\n", line); - continue; - } + /* ADD and DELETE do not accept 'q' response currently. */ + if (status != GOT_STATUS_MODIFY && line[0] == 'q') { + printf("invalid response '%s'\n", line); + continue; } break;