reflog: move "usage" variables and use macros
Move the "usage" variables in builtin/reflog.c to the top of the file, in preparation for later commits defining a common "reflog_usage" in terms of some of these strings, as was done in 8757b35d443 (commit-graph: define common usage with a macro, 2021-08-23). While we're at it let's make them "const char *const", as is the convention with these "usage" variables. The use of macros here is a bit odd, but in subsequent commits we'll make these use the same pattern as builtin/commit-graph.c uses since 8757b35d443 (commit-graph: define common usage with a macro, 2021-08-23). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Mar 17, 2022 at 19:08 UTC
1e91d3faf6c6de7667603c9c81252161ee70d7b9
1 file changed
+24
-15
builtin/reflog.c
+24
-15
@@ -5,8 +5,31 @@
5
#include "worktree.h"
6
#include "reflog.h"
7
8
+#define BUILTIN_REFLOG_EXPIRE_USAGE \
9
+ N_("git reflog expire [--expire=<time>] " \
10
+ "[--expire-unreachable=<time>] " \
11
+ "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] " \
12
+ "[--verbose] [--all] <refs>...")
13
+
14
+#define BUILTIN_REFLOG_DELETE_USAGE \
15
+ N_("git reflog delete [--rewrite] [--updateref] " \
16
+ "[--dry-run | -n] [--verbose] <refs>...")
17
+
18
+#define BUILTIN_REFLOG_EXISTS_USAGE \
19
+ N_("git reflog exists <ref>")
20
+
21
+static const char *const reflog_expire_usage[] = {
22
+ BUILTIN_REFLOG_EXPIRE_USAGE,
23
+ NULL
24
+};
25
+
26
+static const char *const reflog_delete_usage[] = {
27
+ BUILTIN_REFLOG_DELETE_USAGE,
28
+ NULL
29
+};
30
+
31
static const char reflog_exists_usage[] =
9
-N_("git reflog exists <ref>");
32
+ BUILTIN_REFLOG_EXISTS_USAGE;
33
34
static timestamp_t default_reflog_expire;
35
static timestamp_t default_reflog_expire_unreachable;
@@ -147,14 +170,6 @@ static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, const char
170
cb->expire_unreachable = default_reflog_expire_unreachable;
171
}
172
150
-static const char * reflog_expire_usage[] = {
151
- N_("git reflog expire [--expire=<time>] "
152
- "[--expire-unreachable=<time>] "
153
- "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] "
154
- "[--verbose] [--all] <refs>..."),
155
- NULL
156
-};
157
-
173
static int expire_unreachable_callback(const struct option *opt,
174
const char *arg,
175
int unset)
@@ -304,12 +319,6 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
319
return status;
320
}
321
307
-static const char * reflog_delete_usage[] = {
308
- N_("git reflog delete [--rewrite] [--updateref] "
309
- "[--dry-run | -n] [--verbose] <refs>..."),
310
- NULL
311
-};
312
-
322
static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
323
{
324
int i, status = 0;