Commit Diff

Commit:
cc43886eb42b017ad076793f573618dcf9cdb146
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
improve wording of an error message
Actions:
Patch | Tree
commit - d969fa15b6179d07a24a4eb86a60749360741fd8
commit + cc43886eb42b017ad076793f573618dcf9cdb146
blob - b5b08b3be35c11bb53ff35ff3b1e4a100430c622
blob + ea6e03a4134e235d11a7516f27e1f0cf978162ad
--- include/got_error.h
+++ 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" },
 };
 
 /*
blob - cb0b3061b30ca3388719ea99878a76213b31de2d
blob + 1e92b37d93b14ff994cbfaf3cf87b14e5ff846c5
--- regress/cmdline/update.sh
+++ 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)