{"thread":{"id":"57578","subject":"[PATCH 0/8] reflog: migrate fully to parse_options()","startedAt":"2022-03-17T18:08:59Z","lastAt":"2022-03-28T22:45:11Z","messageCount":15,"participants":["Ævar Arnfjörð Bjarmason","John Cai","Junio C Hamano","SZEDER Gábor"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"451578","messageId":"cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com","threadId":"57578","inReplyTo":null,"subject":"[PATCH 0/8] reflog: migrate fully to parse_options()","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-03-17T18:08:32Z","receivedAt":"2022-03-17T18:08:59Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"This is a follow-up to the recently landed 1b4d9b4512e (Merge branch\n'jc/reflog-parse-options', 2022-02-05). It converted a couple of\nsubcommands in builtin/reflog.c to use parse_options(), this converts\nthe rest.\n\nThe 1/8 is a technically unrelated indentation fix for the recently\nlanded 7d3d226e700 (reflog: libify delete reflog function and helpers,\n2022-03-02), but since it's also in the reflog code I figured it was\nOK and that it didn't deserve its own topic.\n\nÆvar Arnfjörð Bjarmason (8):\n reflog.c: indent argument lists\n reflog: refactor cmd_reflog() to \"if\" branches\n reflog tests: add missing \"git reflog exists\" tests\n reflog: move \"usage\" variables and use macros\n git reflog [expire|delete]: make -h output consistent with SYNOPSIS\n reflog exists: use parse_options() API\n reflog: convert to parse_options() API\n reflog [show]: display sensible -h output\n\n builtin/reflog.c | 146 +++++++++++++++++++++++++--------------\n reflog.c | 20 +++---\n t/t1410-reflog.sh | 22 ++++++\n t/t1411-reflog-show.sh | 5 --\n t/t1418-reflog-exists.sh | 37 ++++++++++\n t/test-lib-functions.sh | 2 +-\n 6 files changed, 165 insertions(+), 67 deletions(-)\n create mode 100755 t/t1418-reflog-exists.sh\n\n-- \n2.35.1.1384.g7d2906948a1\n\n"},{"id":"451579","messageId":"patch-1.8-5069b3fd0ff-20220317T180439Z-avarab@gmail.com","threadId":"57578","inReplyTo":"cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com","subject":"[PATCH 1/8] reflog.c: indent argument lists","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-03-17T18:08:33Z","receivedAt":"2022-03-17T18:09:00Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"When reflog.c was lib-ified in 7d3d226e700 (reflog: libify delete\nreflog function and helpers, 2022-03-02) these previously \"static\"\nfunctions were made non-\"static\", but the argument lists were not\ncorrespondingly indented according to our usual coding style. Let's do\nthat.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n reflog.c | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/reflog.c b/reflog.c\nindex 333fd8708fe..82e5a935117 100644\n--- a/reflog.c\n+++ b/reflog.c\n@@ -240,8 +240,8 @@ static int unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit\n * Return true iff the specified reflog entry should be expired.\n */\n int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid,\n-\t\t\t\t const char *email, timestamp_t timestamp, int tz,\n-\t\t\t\t const char *message, void *cb_data)\n+\t\t\t const char *email, timestamp_t timestamp, int tz,\n+\t\t\t const char *message, void *cb_data)\n {\n \tstruct expire_reflog_policy_cb *cb = cb_data;\n \tstruct commit *old_commit, *new_commit;\n@@ -273,10 +273,10 @@ int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid,\n }\n \n int should_expire_reflog_ent_verbose(struct object_id *ooid,\n-\t\t\t\t\t struct object_id *noid,\n-\t\t\t\t\t const char *email,\n-\t\t\t\t\t timestamp_t timestamp, int tz,\n-\t\t\t\t\t const char *message, void *cb_data)\n+\t\t\t\t struct object_id *noid,\n+\t\t\t\t const char *email,\n+\t\t\t\t timestamp_t timestamp, int tz,\n+\t\t\t\t const char *message, void *cb_data)\n {\n \tstruct expire_reflog_policy_cb *cb = cb_data;\n \tint expire;\n@@ -323,8 +323,8 @@ static int is_head(const char *refname)\n }\n \n void reflog_expiry_prepare(const char *refname,\n-\t\t\t\t const struct object_id *oid,\n-\t\t\t\t void *cb_data)\n+\t\t\t const struct object_id *oid,\n+\t\t\t void *cb_data)\n {\n \tstruct expire_reflog_policy_cb *cb = cb_data;\n \tstruct commit_list *elem;\n@@ -377,8 +377,8 @@ void reflog_expiry_cleanup(void *cb_data)\n }\n \n int count_reflog_ent(struct object_id *ooid, struct object_id *noid,\n-\t\tconst char *email, timestamp_t timestamp, int tz,\n-\t\tconst char *message, void *cb_data)\n+\t\t const char *email, timestamp_t timestamp, int tz,\n+\t\t const char *message, void *cb_data)\n {\n \tstruct cmd_reflog_expire_cb *cb = cb_data;\n \tif (!cb->expire_total || timestamp < cb->expire_total)\n-- \n2.35.1.1384.g7d2906948a1\n\n"},{"id":"451580","messageId":"patch-2.8-8bff6976334-20220317T180439Z-avarab@gmail.com","threadId":"57578","inReplyTo":"cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com","subject":"[PATCH 2/8] reflog: refactor cmd_reflog() to \"if\" branches","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-03-17T18:08:34Z","receivedAt":"2022-03-17T18:09:02Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Refactor the \"if\" branches in cmd_reflog() to use \"else if\" instead,\nand remove the whitespace between them.\n\nAs with 92f480909f7 (multi-pack-index: refactor \"goto usage\" pattern,\n2021-08-23) this makes this code more consistent with how\nbuiltin/{bundle,stash,commit-graph,multi-pack-index}.c look and\nbehave. Their top-level commands are all similar sub-command routing\nfunctions.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n builtin/reflog.c | 9 +++------\n 1 file changed, 3 insertions(+), 6 deletions(-)\n\ndiff --git a/builtin/reflog.c b/builtin/reflog.c\nindex 9407f835cb6..c864f276308 100644\n--- a/builtin/reflog.c\n+++ b/builtin/reflog.c\n@@ -384,14 +384,11 @@ int cmd_reflog(int argc, const char **argv, const char *prefix)\n \n \tif (!strcmp(argv[1], \"show\"))\n \t\treturn cmd_log_reflog(argc - 1, argv + 1, prefix);\n-\n-\tif (!strcmp(argv[1], \"expire\"))\n+\telse if (!strcmp(argv[1], \"expire\"))\n \t\treturn cmd_reflog_expire(argc - 1, argv + 1, prefix);\n-\n-\tif (!strcmp(argv[1], \"delete\"))\n+\telse if (!strcmp(argv[1], \"delete\"))\n \t\treturn cmd_reflog_delete(argc - 1, argv + 1, prefix);\n-\n-\tif (!strcmp(argv[1], \"exists\"))\n+\telse if (!strcmp(argv[1], \"exists\"))\n \t\treturn cmd_reflog_exists(argc - 1, argv + 1, prefix);\n \n \treturn cmd_log_reflog(argc, argv, prefix);\n-- \n2.35.1.1384.g7d2906948a1\n\n"},{"id":"451581","messageId":"patch-3.8-5d6500efb55-20220317T180439Z-avarab@gmail.com","threadId":"57578","inReplyTo":"cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com","subject":"[PATCH 3/8] reflog tests: add missing \"git reflog exists\" tests","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-03-17T18:08:35Z","receivedAt":"2022-03-17T18:09:06Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"There were a few \"git reflog exists\" tests scattered over the test\nsuite, but let's consolidate the testing of the main functionality\ninto a new test file. This makes it easier to run just these tests\nduring development.\n\nTo do that amend and extend an existing test added in\nafcb2e7a3b8 (git-reflog: add exists command, 2015-07-21). Let's use\n\"test_must_fail\" instead of \"!\" (in case it segfaults), and test for\nbasic usage, an unknown option etc.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n t/t1411-reflog-show.sh | 5 -----\n t/t1418-reflog-exists.sh | 32 ++++++++++++++++++++++++++++++++\n 2 files changed, 32 insertions(+), 5 deletions(-)\n create mode 100755 t/t1418-reflog-exists.sh\n\ndiff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh\nindex 0bb319b944a..975c4ea83a8 100755\n--- a/t/t1411-reflog-show.sh\n+++ b/t/t1411-reflog-show.sh\n@@ -169,9 +169,4 @@ test_expect_success 'git log -g -p shows diffs vs. parents' '\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'reflog exists works' '\n-\tgit reflog exists refs/heads/main &&\n-\t! git reflog exists refs/heads/nonexistent\n-'\n-\n test_done\ndiff --git a/t/t1418-reflog-exists.sh b/t/t1418-reflog-exists.sh\nnew file mode 100755\nindex 00000000000..60c6411ce3c\n--- /dev/null\n+++ b/t/t1418-reflog-exists.sh\n@@ -0,0 +1,32 @@\n+#!/bin/sh\n+\n+test_description='Test reflog display routines'\n+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main\n+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n+\n+. ./test-lib.sh\n+\n+test_expect_success 'setup' '\n+\ttest_commit A\n+'\n+\n+test_expect_success 'usage' '\n+\ttest_expect_code 129 git reflog exists &&\n+\ttest_expect_code 129 git reflog exists -h\n+'\n+\n+test_expect_success 'usage: unknown option' '\n+\ttest_expect_code 129 git reflog exists --unknown-option\n+'\n+\n+test_expect_success 'reflog exists works' '\n+\tgit reflog exists refs/heads/main &&\n+\ttest_must_fail git reflog exists refs/heads/nonexistent\n+'\n+\n+test_expect_success 'reflog exists works with a \"--\" delimiter' '\n+\tgit reflog exists -- refs/heads/main &&\n+\ttest_must_fail git reflog exists -- refs/heads/nonexistent\n+'\n+\n+test_done\n-- \n2.35.1.1384.g7d2906948a1\n\n"},{"id":"451582","messageId":"patch-4.8-f54f1ea3118-20220317T180439Z-avarab@gmail.com","threadId":"57578","inReplyTo":"cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com","subject":"[PATCH 4/8] reflog: move \"usage\" variables and use macros","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-03-17T18:08:36Z","receivedAt":"2022-03-17T18:09:08Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Move the \"usage\" variables in builtin/reflog.c to the top of the file,\nin preparation for later commits defining a common \"reflog_usage\" in\nterms of some of these strings, as was done in\n8757b35d443 (commit-graph: define common usage with a macro,\n2021-08-23).\n\nWhile we're at it let's make them \"const char *const\", as is the\nconvention with these \"usage\" variables.\n\nThe use of macros here is a bit odd, but in subsequent commits we'll\nmake these use the same pattern as builtin/commit-graph.c uses since\n8757b35d443 (commit-graph: define common usage with a macro,\n2021-08-23).\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n builtin/reflog.c | 39 ++++++++++++++++++++++++---------------\n 1 file changed, 24 insertions(+), 15 deletions(-)\n\ndiff --git a/builtin/reflog.c b/builtin/reflog.c\nindex c864f276308..25313d504a9 100644\n--- a/builtin/reflog.c\n+++ b/builtin/reflog.c\n@@ -5,8 +5,31 @@\n #include \"worktree.h\"\n #include \"reflog.h\"\n \n+#define BUILTIN_REFLOG_EXPIRE_USAGE \\\n+\tN_(\"git reflog expire [--expire=