Commit Diff

Commit:
a4515c6608c1b685bfa9187b2517b44773a11068
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Message:
got: drop commit -A $GOT_AUTHOR restriction As discussed with op and stsp on irc, this prevents the valid case of changing a commit's author to yourself during a histedit operation, and potentially blocks other valid use cases too. ok stsp@ and op@
Actions:
Patch | Tree
commit - 1fa0d17d767f8e443af3b4493f3f2af0e759dda9
commit + a4515c6608c1b685bfa9187b2517b44773a11068
blob - 13ec30c7bbebf2a4b0790af81d13d6db8545e79f
blob + 1ef76ea95b69bf7e45b91f9053a232d241269e7d
--- got/got.c
+++ got/got.c
@@ -9144,11 +9144,6 @@ cmd_commit(int argc, char *argv[])
 	if (error)
 		goto done;
 
-	if (author != NULL && !strcmp(committer, author)) {
-		error = got_error(GOT_ERR_COMMIT_REDUNDANT_AUTHOR);
-		goto done;
-	}
-
 	if (author == NULL)
 		author = committer;
 
blob - f6291e8407d22bd8dea75ff94f8f7b88ebafcb78
blob + 53f181cbdaef76fe21b918d662302e97c34c6b3b
--- include/got_error.h
+++ include/got_error.h
@@ -172,7 +172,7 @@
 #define GOT_ERR_BAD_TAG_SIGNATURE 154
 #define GOT_ERR_VERIFY_TAG_SIGNATURE 155
 #define GOT_ERR_SIGNING_TAG	156
-#define GOT_ERR_COMMIT_REDUNDANT_AUTHOR 157
+/* 157 is currently unused */
 #define GOT_ERR_BAD_QUERYSTRING	158
 #define GOT_ERR_INTEGRATE_BRANCH 159
 #define GOT_ERR_BAD_REQUEST	160
blob - 041a41fbd209cbb7d7131b52327e59668eea4f41
blob + 733765ad88418ae076d11d4f7e6e66e0ead5ae9e
--- lib/error.c
+++ lib/error.c
@@ -219,8 +219,6 @@ static const struct got_error got_errors[] = {
 	{ GOT_ERR_BAD_TAG_SIGNATURE, "invalid tag signature" },
 	{ GOT_ERR_VERIFY_TAG_SIGNATURE, "cannot verify signature" },
 	{ GOT_ERR_SIGNING_TAG, "unable to sign tag" },
-	{ GOT_ERR_COMMIT_REDUNDANT_AUTHOR, "specified author is equal to the "
-	    "default one"},
 	{ GOT_ERR_BAD_QUERYSTRING, "invalid query string" },
 	{ GOT_ERR_INTEGRATE_BRANCH, "will not integrate into a reference "
 	    "outside the \"refs/heads/\" reference namespace" },
blob - 6005da9a4302b4e31d5dc9469c9c35b7abef803f
blob + 0543d4bebab658396a069f968553a9b43594ca74
--- regress/cmdline/commit.sh
+++ regress/cmdline/commit.sh
@@ -763,27 +763,7 @@ test_commit_cmdline_author() {
 	fi
 
 	echo "modified alpha" > $testroot/wt/alpha
-
-	# first try with a -A equals to $GOT_AUTHOR
-	(cd $testroot/wt && got commit -A "$GOT_AUTHOR" -m 'edit alpha') \
-		> /dev/null 2> $testroot/stderr
-	ret=$?
-	if [ $ret -eq 0 ]; then
-		test_done "$testroot" 1
-		return 1
-	fi
-
-	echo 'got: specified author is equal to the default one' \
-	     > $testroot/stderr.expected
-	cmp -s $testroot/stderr.expected $testroot/stderr
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		diff -u $testroot/stderr.expected $testroot/stderr
-		test_done "$testroot" $ret
-		return 1
-	fi
 
-	# try again with a different author
 	local author="Foo <foo@example.com>"
 	(cd $testroot/wt && got commit -A "$author" -m 'edit alpha') \
 		> /dev/null