Commit Diff

Commit:
aeac2f67f6cccbabc915bfd6d54fdaa96d18f180
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas.adam22@gmail.com>
Date:
Message:
make got stage -p behave the same way in interactive and -F modes for 'q' Lucas agrees
Actions:
Patch | Tree
commit - 9d61c99e2526730cfa5f256a3b0c37bfb25b8f93
commit + aeac2f67f6cccbabc915bfd6d54fdaa96d18f180
blob - 498c8e99675905446ac10e717d857bff8cd05a6b
blob + 12cfacc7603a2419cccf6dd39cce2e127b8ace9e
--- got/got.c
+++ got/got.c
@@ -8682,11 +8682,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;