Commit Diff

Commit:
f605b7655a235f6bd6473ca91ae9fb428ae1a74b
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
gotd regress: update error message
Actions:
Patch | Tree
commit - 6e5b538555a0da104cdce0480a721abca02f58b1
commit + f605b7655a235f6bd6473ca91ae9fb428ae1a74b
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