Commit Diff

Commit:
ffcfe569470b9a24db65cf13a33fb059d17752a2
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 - b1c950bff5bebefb962adbfcac9de1dabe16def8
commit + ffcfe569470b9a24db65cf13a33fb059d17752a2
blob - 3f0c7462ca5f91c506d50f1069da4df4835c65ec
blob + b574893efe6b88b89bfc49b4d55118a0f4506e26
--- got/got.c
+++ got/got.c
@@ -7367,28 +7367,22 @@ cmd_tag(int argc, char *argv[])
 		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];