commit - a5a71e8e0c49640e7069a92560a45262a0d4dd08
commit + a2887370ed151037710c478f1ada8de55e6e9da9
blob - 7f0160eb84167c81651a77e41063ae514649d020
blob + d39a982c349b94ba212f83407dbf18bbd327bc98
--- got/got.c
+++ got/got.c
@@ -3569,11 +3569,9 @@ cmd_tag(int argc, char *argv[])
 			usage_tag();
 	} else if (argc < 1 || argc > 2)
 		usage_tag();
-	else {
-		tag_name = argv[0];
-		if (argc > 1)
-			commit_id_arg = argv[1];
-	}
+	else if (argc > 1)
+		commit_id_arg = argv[1];
+	tag_name = argv[0];
 
 #ifndef PROFILE
 	if (do_list) {