commit 50eb7cdf4a2cf4faa7b494ffd0520471b93905e7
from: Omar Polo <op@omarpolo.com>
date: Tue Jul 09 17:32:00 2024 UTC

gotd regress: update error message

commit - 75e58d893ea728a250b35dff13d82123aaabc9f0
commit + 50eb7cdf4a2cf4faa7b494ffd0520471b93905e7
blob - 4a5abbaf3b9c5b810ba8185addece65961258f6f
blob + ea1abadcdca2ecec752031ec65bd64a5796ddc1e
--- regress/gotd/repo_write_protected.sh
+++ regress/gotd/repo_write_protected.sh
@@ -253,9 +253,19 @@ test_modify_protected_branch() {
 		test_done "$testroot" 1
 		return 1
 	fi
+ 
+	echo -n 'got: refs/heads/main: branch on server has' \
+	    > $testroot/stderr.expected
+	echo -n ' a different ancestry; either fetch changes' \
+	    >> $testroot/stderr.expected
+	echo -n ' from server and then rebase or merge local' \
+	    >> $testroot/stderr.expected
+	echo -n ' branch before sending, or ignore ancestry' \
+	    >> $testroot/stderr.expected
+	echo -n ' with send -f (can lead to data loss on' \
+	    >> $testroot/stderr.expected
+	echo ' server)' >> $testroot/stderr.expected
 
-	echo 'got: refs/heads/main: fetch and rebase required' \
-		>> $testroot/stderr.expected
 	if ! cmp -s $testroot/stderr.expected $testroot/stderr; then
 		diff -u $testroot/stderr.expected $testroot/stderr
 		test_done "$testroot" 1