# [PATCH 3/3] tag: Add more tests about mixing incompatible modes and options 5 messages from 2008-11-04 to 2008-11-04. Participants: Samuel Tardieu, Junio C Hamano. Thread: https://gitlist.dev/t/16166 ## Samuel Tardieu, 2008-11-04 12:42 Subject: [PATCH 1/3] tag: Do not allow to call "git tag" in more than one operating mode Message-ID: <20081104124207.18273.31679.stgit@arrakis.enst.fr> URL: https://gitlist.dev/e/20081104124207.18273.31679.stgit%40arrakis.enst.fr ``` If "git tag -d -l -v ..." is called, only "-l" is honored, which is arbitrary and wrong. This patch checks that "git tag" knows in what mode it operates before performing any operation. Signed-Off-By: Samuel Tardieu --- builtin-tag.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/builtin-tag.c b/builtin-tag.c index 84db156..5ce0e21 100644 --- a/builtin-tag.c +++ b/builtin-tag.c @@ -380,7 +380,11 @@ int cmd_tag(int argc, const char **argv, const char *prefix) } if (sign) annotate = 1; + if (argc == 0 && !(delete || verify)) + list = 1; + if (list + delete + verify > 1) + usage_with_options(git_tag_usage, options); if (list) return list_tags(argv[0], lines); if (delete) @@ -406,11 +410,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix) } } - if (argc == 0) { - if (annotate) - usage_with_options(git_tag_usage, options); - return list_tags(NULL, lines); - } tag = argv[0]; object_ref = argc == 2 ? argv[1] : "HEAD"; ``` ## Samuel Tardieu, 2008-11-04 12:42 Subject: [PATCH 2/3] tag: Check that options are only allowed in the appropriate mode Message-ID: <20081104124212.18273.5402.stgit@arrakis.enst.fr> URL: https://gitlist.dev/e/20081104124212.18273.5402.stgit%40arrakis.enst.fr In-Reply-To: <20081104124207.18273.31679.stgit@arrakis.enst.fr> ``` "git tag" should not silently accept unrecognized options when operating in a given mode. For example, "git tag -n 100", which may be a typo for "git tag -n100", should not silently create a tag named "100". Signed-off-by: Samuel Tardieu --- builtin-tag.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/builtin-tag.c b/builtin-tag.c index 5ce0e21..d339971 100644 --- a/builtin-tag.c +++ b/builtin-tag.c @@ -344,7 +344,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) const char *object_ref, *tag; struct ref_lock *lock; - int annotate = 0, sign = 0, force = 0, lines = 0, + int annotate = 0, sign = 0, force = 0, lines = -1, list = 0, delete = 0, verify = 0; const char *msgfile = NULL, *keyid = NULL; struct msg_arg msg = { 0, STRBUF_INIT }; @@ -383,10 +383,16 @@ int cmd_tag(int argc, const char **argv, const char *prefix) if (argc == 0 && !(delete || verify)) list = 1; + if ((annotate || msg.given || msgfile || force) && + (list || delete || verify)) + usage_with_options(git_tag_usage, options); + if (list + delete + verify > 1) usage_with_options(git_tag_usage, options); if (list) - return list_tags(argv[0], lines); + return list_tags(argv[0], lines == -1 ? 0 : lines); + if (lines != -1) + die("-n option is only allowed with -l."); if (delete) return for_each_tag_name(argv, delete_tag); if (verify) ``` ## Samuel Tardieu, 2008-11-04 12:42 Subject: [PATCH 3/3] tag: Add more tests about mixing incompatible modes and options Message-ID: <20081104124217.18273.40967.stgit@arrakis.enst.fr> URL: https://gitlist.dev/e/20081104124217.18273.40967.stgit%40arrakis.enst.fr In-Reply-To: <20081104124207.18273.31679.stgit@arrakis.enst.fr> ``` Signed-Off-By: Samuel Tardieu --- t/t7004-tag.sh | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index f0edbf1..f377fea 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1090,4 +1090,15 @@ test_expect_success 'filename for the message is relative to cwd' ' git cat-file tag tag-from-subdir-2 | grep "in sub directory" ' +# mixing modes and options: + +test_expect_success 'mixing incompatibles modes and options is forbidden' ' + test_must_fail git tag -a + test_must_fail git tag -l -v + test_must_fail git tag -n 100 + test_must_fail git tag -l -m msg + test_must_fail git tag -l -F some file + test_must_fail git tag -v -s +' + test_done ``` ## Junio C Hamano, 2008-11-04 22:47 Subject: Re: [PATCH 1/3] tag: Do not allow to call "git tag" in more than one operating mode Message-ID: <7vej1rqfar.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vej1rqfar.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20081104124207.18273.31679.stgit@arrakis.enst.fr> ``` Samuel Tardieu writes: > If "git tag -d -l -v ..." is called, only "-l" is honored, which is > arbitrary and wrong. > > This patch checks that "git tag" knows in what mode it operates before > performing any operation. > > Signed-Off-By: Samuel Tardieu s/-Off-B/off-b/; I think this patch breaks "git tag -a" or "git tag -s", but I didn't try. Run $ git tag -s with and without your patch. ``` ## Samuel Tardieu, 2008-11-04 23:11 Subject: Re: [PATCH 1/3] tag: Do not allow to call "git tag" in more than one operating mode Message-ID: <2008-11-05-00-11-10+trackit+sam@rfc1149.net> URL: https://gitlist.dev/e/2008-11-05-00-11-10%2Btrackit%2Bsam%40rfc1149.net In-Reply-To: <7vej1rqfar.fsf@gitster.siamese.dyndns.org> ``` * Junio C Hamano [2008-11-04 14:47:40 -0800] | I think this patch breaks "git tag -a" or "git tag -s", but I didn't try. | Run | | $ git tag -s | | with and without your patch. That's right. I didn't notice it because I developped the 2/3 at the same time and tested with both applied at the same time. I will resubmit the serie with the first two merged together, as they are both short, on the same topic and fix the same problem. ```