Commit f5a17245fd8503e5cd7c2d1dd464c8a435e83463

Stefan Sperling 2019-08-08T09:09:51

make got -p skip deletion question consistent with the others

diff --git a/got/got.c b/got/got.c
index 39818d9..af3c2e7 100644
--- a/got/got.c
+++ b/got/got.c
@@ -5205,7 +5205,7 @@ show_change(unsigned char status, const char *path, FILE *patch_file, int n,
 		printf("A  %s\nstage this addition? [y/n] ", path);
 		break;
 	case GOT_STATUS_DELETE:
-		printf("D  %s\nstage deletion? [y/n] ", path);
+		printf("D  %s\nstage this deletion? [y/n] ", path);
 		break;
 	case GOT_STATUS_MODIFY:
 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
diff --git a/regress/cmdline/stage.sh b/regress/cmdline/stage.sh
index a19a072..f743dbf 100755
--- a/regress/cmdline/stage.sh
+++ b/regress/cmdline/stage.sh
@@ -1494,7 +1494,7 @@ function test_stage_patch_removed {
 	echo -n > $testroot/stdout.expected
 
 	echo "D  beta" > $testroot/stdout.expected
-	echo "stage deletion? [y/n] y" >> $testroot/stdout.expected
+	echo "stage this deletion? [y/n] y" >> $testroot/stdout.expected
 	cmp -s $testroot/stdout.expected $testroot/stdout
 	ret="$?"
 	if [ "$ret" != "0" ]; then
@@ -1591,7 +1591,7 @@ stage this change? [y/n/q] y
 M  numbers (change 2 of 3)
 stage this change? [y/n/q] q
 D  zzz
-stage deletion? [y/n] n
+stage this deletion? [y/n] n
 EOF
 	cmp -s $testroot/stdout.expected $testroot/stdout
 	ret="$?"