{"thread":{"id":"37573","subject":"[PATCH v3 1/3] t1503: test rev-parse --verify --quiet with deleted reflogs","startedAt":"2014-09-15T19:07:37Z","lastAt":"2014-09-16T03:06:17Z","messageCount":7,"participants":["David Aguilar","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":3},"messages":[{"id":"249449","messageId":"1410808059-1459-1-git-send-email-davvid@gmail.com","threadId":"37573","inReplyTo":null,"subject":"[PATCH v3 1/3] t1503: test rev-parse --verify --quiet with deleted reflogs","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2014-09-15T19:07:37Z","receivedAt":"2014-09-15T19:07:37Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Ensure that rev-parse --verify --quiet is silent when asked\nabout deleted reflog entries.\n\nHelped-by: Fabian Ruch \nSigned-off-by: David Aguilar \n---\nDifferences since last time:\n\nThis goes back to the original approach of using \"git update-ref\"\nplumbing instead of \"git branch\" when testing deleted reflogs.\n\n t/t1503-rev-parse-verify.sh | 9 +++++++++\n 1 file changed, 9 insertions(+)\n\ndiff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh\nindex 813cc1b..fd9d0c3 100755\n--- a/t/t1503-rev-parse-verify.sh\n+++ b/t/t1503-rev-parse-verify.sh\n@@ -83,6 +83,15 @@ test_expect_success 'fails silently when using -q' '\n \ttest -z \"$(cat error)\"\n '\n \n+test_expect_success 'fails silently when using -q with deleted reflogs' '\n+\tref=$(git rev-parse HEAD) &&\n+\t: >.git/logs/refs/test &&\n+\tgit update-ref -m \"reflog message for refs/test\" refs/test \"$ref\" &&\n+\tgit reflog delete --updateref --rewrite refs/test@{0} &&\n+\ttest_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 &&\n+\ttest -z \"$(cat error)\"\n+'\n+\n test_expect_success 'no stdout output on error' '\n \ttest -z \"$(git rev-parse --verify)\" &&\n \ttest -z \"$(git rev-parse --verify foo)\" &&\n-- \n2.1.0.30.g05c535b.dirty\n"},{"id":"249450","messageId":"1410808059-1459-2-git-send-email-davvid@gmail.com","threadId":"37573","inReplyTo":"1410808059-1459-1-git-send-email-davvid@gmail.com","subject":"[PATCH v3 2/3] t1503: use test_must_be_empty","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2014-09-15T19:07:38Z","receivedAt":"2014-09-15T19:07:38Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Use `test_must_be_be_empty ` instead of `test -z \"$(cat )\"`.\n\nSuggested-by: Fabian Ruch \nSigned-off-by: David Aguilar \n---\nUnchanged since last time, but rebased for the change in the\nprevious patch.\n\n t/t1503-rev-parse-verify.sh | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh\nindex fd9d0c3..4fe9f0e 100755\n--- a/t/t1503-rev-parse-verify.sh\n+++ b/t/t1503-rev-parse-verify.sh\n@@ -72,15 +72,15 @@ test_expect_success 'fails with any bad rev or many good revs' '\n \n test_expect_success 'fails silently when using -q' '\n \ttest_must_fail git rev-parse --verify --quiet 2>error &&\n-\ttest -z \"$(cat error)\" &&\n+\ttest_must_be_empty error &&\n \ttest_must_fail git rev-parse -q --verify foo 2>error &&\n-\ttest -z \"$(cat error)\" &&\n+\ttest_must_be_empty error &&\n \ttest_must_fail git rev-parse --verify -q HEAD bar 2>error &&\n-\ttest -z \"$(cat error)\" &&\n+\ttest_must_be_empty error &&\n \ttest_must_fail git rev-parse --quiet --verify baz HEAD 2>error &&\n-\ttest -z \"$(cat error)\" &&\n+\ttest_must_be_empty error &&\n \ttest_must_fail git rev-parse -q --verify $HASH2 HEAD 2>error &&\n-\ttest -z \"$(cat error)\"\n+\ttest_must_be_empty error\n '\n \n test_expect_success 'fails silently when using -q with deleted reflogs' '\n@@ -89,7 +89,7 @@ test_expect_success 'fails silently when using -q with deleted reflogs' '\n \tgit update-ref -m \"reflog message for refs/test\" refs/test \"$ref\" &&\n \tgit reflog delete --updateref --rewrite refs/test@{0} &&\n \ttest_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 &&\n-\ttest -z \"$(cat error)\"\n+\ttest_must_be_empty error\n '\n \n test_expect_success 'no stdout output on error' '\n-- \n2.1.0.30.g05c535b.dirty\n"},{"id":"249451","messageId":"1410808059-1459-3-git-send-email-davvid@gmail.com","threadId":"37573","inReplyTo":"1410808059-1459-2-git-send-email-davvid@gmail.com","subject":"[PATCH v3 3/3] Documentation: a note about stdout for git rev-parse --verify --quiet","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2014-09-15T19:07:39Z","receivedAt":"2014-09-15T19:07:39Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Signed-off-by: David Aguilar \n---\nThis patch is new: we now mention that stdout contains the valid object name\nwhen --quiet is used, which may not be clear when reading this paragraph in\nisolation.\n\n Documentation/git-rev-parse.txt | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 0b84769..fa4a8c3 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -114,6 +114,7 @@ can be used.\n \tOnly meaningful in `--verify` mode. Do not output an error\n \tmessage if the first argument is not a valid object name;\n \tinstead exit with non-zero status silently.\n+\tSHA-1s for valid object names are printed to stdout on success.\n \n --sq::\n \tUsually the output is made one line per flag and\n-- \n2.1.0.30.g05c535b.dirty\n"},{"id":"249490","messageId":"xmqqk3544ire.fsf@gitster.dls.corp.google.com","threadId":"37573","inReplyTo":"1410808059-1459-1-git-send-email-davvid@gmail.com","subject":"Re: [PATCH v3 1/3] t1503: test rev-parse --verify --quiet with deleted reflogs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-09-15T22:32:37Z","receivedAt":"2014-09-15T22:32:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Aguilar writes:\n\n> Ensure that rev-parse --verify --quiet is silent when asked\n> about deleted reflog entries.\n>\n> Helped-by: Fabian Ruch \n> Signed-off-by: David Aguilar \n> ---\n> Differences since last time:\n>\n> This goes back to the original approach of using \"git update-ref\"\n> plumbing instead of \"git branch\" when testing deleted reflogs.\n\nIs this 1/3 (the first one in the series) supposed to pass without\nno other patches, either in the series or something outside?\n"},{"id":"249491","messageId":"xmqqfvfs4ip7.fsf@gitster.dls.corp.google.com","threadId":"37573","inReplyTo":"1410808059-1459-2-git-send-email-davvid@gmail.com","subject":"Re: [PATCH v3 2/3] t1503: use test_must_be_empty","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-09-15T22:33:56Z","receivedAt":"2014-09-15T22:33:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Aguilar writes:\n\n> Use `test_must_be_be_empty ` instead of `test -z \"$(cat )\"`.\n>\n> Suggested-by: Fabian Ruch \n> Signed-off-by: David Aguilar \n> ---\n> Unchanged since last time, but rebased for the change in the\n> previous patch.\n\nIt probably makes more sense to have this at the beginning of a\nseries as preliminary clean-up. That way, the more interesting\nchange does not have to have \"test -z $(cat ...)\" that makes readers\ngo \"Huh?\".\n\n\n\n>\n> t/t1503-rev-parse-verify.sh | 12 ++++++------\n> 1 file changed, 6 insertions(+), 6 deletions(-)\n>\n> diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh\n> index fd9d0c3..4fe9f0e 100755\n> --- a/t/t1503-rev-parse-verify.sh\n> +++ b/t/t1503-rev-parse-verify.sh\n> @@ -72,15 +72,15 @@ test_expect_success 'fails with any bad rev or many good revs' '\n> \n> test_expect_success 'fails silently when using -q' '\n> \ttest_must_fail git rev-parse --verify --quiet 2>error &&\n> -\ttest -z \"$(cat error)\" &&\n> +\ttest_must_be_empty error &&\n> \ttest_must_fail git rev-parse -q --verify foo 2>error &&\n> -\ttest -z \"$(cat error)\" &&\n> +\ttest_must_be_empty error &&\n> \ttest_must_fail git rev-parse --verify -q HEAD bar 2>error &&\n> -\ttest -z \"$(cat error)\" &&\n> +\ttest_must_be_empty error &&\n> \ttest_must_fail git rev-parse --quiet --verify baz HEAD 2>error &&\n> -\ttest -z \"$(cat error)\" &&\n> +\ttest_must_be_empty error &&\n> \ttest_must_fail git rev-parse -q --verify $HASH2 HEAD 2>error &&\n> -\ttest -z \"$(cat error)\"\n> +\ttest_must_be_empty error\n> '\n> \n> test_expect_success 'fails silently when using -q with deleted reflogs' '\n> @@ -89,7 +89,7 @@ test_expect_success 'fails silently when using -q with deleted reflogs' '\n> \tgit update-ref -m \"reflog message for refs/test\" refs/test \"$ref\" &&\n> \tgit reflog delete --updateref --rewrite refs/test@{0} &&\n> \ttest_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 &&\n> -\ttest -z \"$(cat error)\"\n> +\ttest_must_be_empty error\n> '\n> \n> test_expect_success 'no stdout output on error' '\n"},{"id":"249492","messageId":"xmqqbnqg4ion.fsf@gitster.dls.corp.google.com","threadId":"37573","inReplyTo":"1410808059-1459-3-git-send-email-davvid@gmail.com","subject":"Re: [PATCH v3 3/3] Documentation: a note about stdout for git rev-parse --verify --quiet","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-09-15T22:34:16Z","receivedAt":"2014-09-15T22:34:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Aguilar writes:\n\n> Signed-off-by: David Aguilar \n> ---\n> This patch is new: we now mention that stdout contains the valid object name\n> when --quiet is used, which may not be clear when reading this paragraph in\n> isolation.\n>\n> Documentation/git-rev-parse.txt | 1 +\n> 1 file changed, 1 insertion(+)\n>\n> diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\n> index 0b84769..fa4a8c3 100644\n> --- a/Documentation/git-rev-parse.txt\n> +++ b/Documentation/git-rev-parse.txt\n> @@ -114,6 +114,7 @@ can be used.\n> \tOnly meaningful in `--verify` mode. Do not output an error\n> \tmessage if the first argument is not a valid object name;\n> \tinstead exit with non-zero status silently.\n> +\tSHA-1s for valid object names are printed to stdout on success.\n\nOK. Thanks.\n\n> \n> --sq::\n> \tUsually the output is made one line per flag and\n"},{"id":"249501","messageId":"20140916030615.GA2286@gmail.com","threadId":"37573","inReplyTo":"xmqqk3544ire.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v3 1/3] t1503: test rev-parse --verify --quiet with deleted reflogs","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2014-09-16T03:06:17Z","receivedAt":"2014-09-16T03:06:17Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Mon, Sep 15, 2014 at 03:32:37PM -0700, Junio C Hamano wrote:\n> David Aguilar writes:\n> \n> > Ensure that rev-parse --verify --quiet is silent when asked\n> > about deleted reflog entries.\n> >\n> > Helped-by: Fabian Ruch \n> > Signed-off-by: David Aguilar \n> > ---\n> > Differences since last time:\n> >\n> > This goes back to the original approach of using \"git update-ref\"\n> > plumbing instead of \"git branch\" when testing deleted reflogs.\n> \n> Is this 1/3 (the first one in the series) supposed to pass without\n> no other patches, either in the series or something outside?\n> \n\nIt depends on the patch I sent not too long ago that makes\nrev-parse --quiet actually quiet.\n\nI'll rework this series to do the test_must_be_empty cleanup\nfirst and include the prerequisite patch when I re-roll shortly.\n-- \nDavid\n"}]}