{"thread":{"id":"13478","subject":"[PATCH 2/3] rev-parse: fix using \"--default\" with \"--verify\"","startedAt":"2008-05-11T16:27:36Z","lastAt":"2008-05-11T16:27:36Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"76631","messageId":"20080511182736.b279b655.chriscool@tuxfamily.org","threadId":"13478","inReplyTo":null,"subject":"[PATCH 2/3] rev-parse: fix using \"--default\" with \"--verify\"","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2008-05-11T16:27:36Z","receivedAt":"2008-05-11T16:27:36Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Before this patch, something like:\n\n$ git rev-parse --verify HEAD --default master\n\ndid not work, while:\n\n$ git rev-parse --default master --verify HEAD\n\nworked.\n\nThis patch fixes that, so that they both work (assuming\nHEAD and master can be parsed).\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n builtin-rev-parse.c         |    2 ++\n t/t1503-rev-parse-verify.sh |   11 +++++------\n 2 files changed, 7 insertions(+), 6 deletions(-)\n\ndiff --git a/builtin-rev-parse.c b/builtin-rev-parse.c\nindex 0e59707..7dbf282 100644\n--- a/builtin-rev-parse.c\n+++ b/builtin-rev-parse.c\n@@ -583,6 +583,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)\n \t\t\tcontinue;\n \t\tverify_filename(prefix, arg);\n \t}\n+\tif (verify && revs_count == 1)\n+\t\treturn 0;\n \tshow_default();\n \tif (verify && revs_count != 1)\n \t\tdie_no_single_rev(quiet);\ndiff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh\nindex a0d14cb..e93f1b3 100755\n--- a/t/t1503-rev-parse-verify.sh\n+++ b/t/t1503-rev-parse-verify.sh\n@@ -97,18 +97,17 @@ test_expect_failure '3 no stdout output on error' '\n \ttest -z \"$(git rev-parse --verify $HASH2 HEAD)\"\n '\n \n-test_expect_success '1 with --default' '\n+test_expect_success 'use --default' '\n \tgit rev-parse --verify --default master &&\n \tgit rev-parse --verify --default master HEAD &&\n \tgit rev-parse --default master --verify &&\n \tgit rev-parse --default master --verify HEAD &&\n+\tgit rev-parse --verify HEAD --default master &&\n \ttest_must_fail git rev-parse --verify foo --default master &&\n \ttest_must_fail git rev-parse --default HEAD --verify bar &&\n-\ttest_must_fail git rev-parse --verify --default HEAD baz\n-'\n-\n-test_expect_failure '2 with --default' '\n-\tgit rev-parse --verify HEAD --default master\n+\ttest_must_fail git rev-parse --verify --default HEAD baz &&\n+\ttest_must_fail git rev-parse --default foo --verify &&\n+\ttest_must_fail git rev-parse --verify --default bar\n '\n \n test_done\n-- \n1.5.5.1.347.g86562\n"}]}