Commit cc43886eb42b017ad076793f573618dcf9cdb146

Stefan Sperling 2019-05-22T15:28:17

improve wording of an error message

diff --git a/include/got_error.h b/include/got_error.h
index b5b08b3..ea6e03a 100644
--- a/include/got_error.h
+++ b/include/got_error.h
@@ -174,7 +174,7 @@ static const struct got_error {
 	{ GOT_ERR_DIR_NOT_EMPTY, "directory exists and is not empty" },
 	{ GOT_ERR_COMMIT_NO_CHANGES, "no changes to commit" },
 	{ GOT_ERR_BRANCH_MOVED,	"work tree's branch reference has moved; "
-	    "new branch or rebase required" },
+	    "new branch reference or rebase required" },
 };
 
 /*
diff --git a/regress/cmdline/update.sh b/regress/cmdline/update.sh
index cb0b306..1e92b37 100755
--- a/regress/cmdline/update.sh
+++ b/regress/cmdline/update.sh
@@ -1293,7 +1293,7 @@ function test_update_moved_branch_ref {
 	echo -n > $testroot/stdout.expected
 	echo -n "got: work tree's branch reference has moved; " \
 		> $testroot/stderr.expected
-	echo "new branch or rebase required" >> $testroot/stderr.expected
+	echo "new branch reference or rebase required" >> $testroot/stderr.expected
 
 	(cd $testroot/wt && got update > $testroot/stdout 2> $testroot/stderr)