Commit Diff

Commit:
f5a17245fd8503e5cd7c2d1dd464c8a435e83463
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
make got -p skip deletion question consistent with the others
Actions:
Patch | Tree
commit - ec9d9b2fbd416cf92abcb34a646a230acb9966f6
commit + f5a17245fd8503e5cd7c2d1dd464c8a435e83463
blob - 39818d9031549d1ff45d02cc9b403152803c9bab
blob + af3c2e76e6aa26242c5c90e65a3a35249dc0f83e
--- got/got.c
+++ got/got.c
@@ -5205,7 +5205,7 @@ show_change(unsigned char status, const char *path, FI
 		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)
blob - a19a072b1bc6c6294485114f0dd66d1796ac3697
blob + f743dbf50f1eccc4c81a1a1f4775856cce86fa07
--- regress/cmdline/stage.sh
+++ 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="$?"