Commit Diff

Commit:
6713dda82d321c9b7c87aa5d63f497dd2963482d
From:
Mark Jamsek <mark@jamsek.dev>
Via:
Thomas Adam <thomas@xteddy.org>
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 - a0abeae54173ae5718c4d39250ee22483512e59b
commit + 6713dda82d321c9b7c87aa5d63f497dd2963482d
blob - 3e6557afb66d2dca86737356b79f02d52dfb7ea2
blob + de0929fc3f44c48f6ae236a2e5afd50971116792
--- 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 - afcfed5fde3a472bae8c325446833512579d1125
blob + ff3e3c32b1744464fe0f014b5fe792249db374c8
--- include/got_error.h
+++ include/got_error.h
@@ -174,7 +174,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 - fbfae58d5ac8823e5199dccfa6a0178dcb39965c
blob + 65f80e0880b3c1a7d26448fd7d30e83e481613c9
--- lib/error.c
+++ lib/error.c
@@ -228,8 +228,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 - f3efa2956540364485d477c0e81fdc4c4fc43de6
blob + 2f11c2463843674c09b5ed82946474de2201aa65
--- 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