Commit Diff

Commit:
60cf507132c154811cbfda9500ad13d24c6edd88
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
got tag -V is like tag -l with verification, fix option-conflicts accordingly
Actions:
Patch | Tree
commit - ebc58f124450a45aa84172f009cdf14d9974e1ed
commit + 60cf507132c154811cbfda9500ad13d24c6edd88
blob - 88c54d94baa348cc77638385314ea2bb7b70fb1b
blob + 7efd0d60010d89b10646f5ab6b5b1be9e5a06b02
--- got/got.c
+++ got/got.c
@@ -7379,12 +7379,22 @@ cmd_tag(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 
-	if (do_list) {
+	if (do_list || verify_tags) {
 		if (commit_id_arg != NULL)
 			errx(1,
 			    "-c option can only be used when creating a tag");
-		if (tagmsg)
-			option_conflict('l', 'm');
+		if (tagmsg) {
+			if (do_list)
+				option_conflict('l', 'm');
+			else
+				option_conflict('V', 'm');
+		}
+		if (signer_id) {
+			if (do_list)
+				option_conflict('l', 's');
+			else
+				option_conflict('V', 's');
+		}
 		if (argc > 1)
 			usage_tag();
 	} else if (argc != 1)