Commit Diff

Commit:
153d5e5853a81c12e6cca6d33811d97ab94768bb
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
add option-conflict handling for 'got tag' -s and -V options
Actions:
Patch | Tree
commit - ca61cecaa7d978cae3b4292c2f16001a71e77ec6
commit + 153d5e5853a81c12e6cca6d33811d97ab94768bb
blob - 77e02b0076fdcaac0e97746cbacf706297eabf54
blob + 2f855d51cfc733ee74ef3343b94f8bf4b4597341
--- got/got.c
+++ got/got.c
@@ -7386,10 +7386,26 @@ cmd_tag(int argc, char *argv[])
 			    "-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 (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];