Mike Rappazzo <rappa...@gmail.com> writes:

>>> +     int is_bare = is_bare_repository();
>>
>> Please do not introduce decl-after-stmt.
>
> Since I reused this value below, I thought it would be acceptable.

Use of a new variable is fine.  "Do not declare one in a block after
you already wrote statement" is what "decl-after-stmt not allowed"
means.  In your patch:

+static int list(int ac, const char **av, const char *prefix)
+{
+       int main_only = 0;
+       struct option options[] = {
+               OPT_BOOL(0, "main-only", &main_only, N_("only list the main 
worktree")),
+               OPT_END()
+       };
+
+       ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+       if (ac)
+               usage_with_options(worktree_usage, options);
+
+       struct strbuf main_path = STRBUF_INIT;
+       const char* common_dir = get_git_common_dir();
+       int is_bare = is_bare_repository();

Three variables, main_path, common_dir and is_bare are declared here
after statements such as a call to parse_options().  Don't.

+static int list(int ac, const char **av, const char *prefix)
+{
+       int main_only = 0;
+       struct strbuf main_path = STRBUF_INIT;
+       const char *common_dir;
+       int is_bare;
+       struct option options[] = {
+               OPT_BOOL(0, "main-only", &main_only, N_("only list the main 
worktree")),
+               OPT_END()
+       };
+
+       ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+       if (ac)
+               usage_with_options(worktree_usage, options);
+
+       common_dir = get_git_common_dir();
+       int is_bare = is_bare_repository();

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to