Commit Diff

Commit:
ef98a369796fc222fed7184de02b28622b5b1770
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
got tag -V is like tag -l with verification, fix option-conflicts accordingly
Actions:
Patch | Tree
commit - 49a2d94a5f7df3001e60ade1362ad31c2895a496
commit + ef98a369796fc222fed7184de02b28622b5b1770
blob - 74be94512b30f0c38e38fcf40dab876d4f158a94
blob + 873d24a66c0525e5995079a57813ac30f2b4cd30
--- got/got.c
+++ got/got.c
@@ -7380,33 +7380,27 @@ 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 (signer_id)
-			option_conflict('l', 's');
-		if (verify_tags)
-			option_conflict('l', 'V');
+		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)
 		usage_tag();
 
-	if (verify_tags) {
-		if (commit_id_arg != NULL)
-			errx(1,
-			    "-c option can only be used when creating a tag");
-		if (tagmsg)
-			option_conflict('V', 'm');
-		if (signer_id)
-			option_conflict('V', 's');
-		if (do_list)
-			option_conflict('V', 'l');
-	}
-
 	if (argc == 1)
 		tag_name = argv[0];