[PATCH] fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL

[PATCH] fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL

[Stefan Beller]

This task emerged from b04ba2bb4.
All occurrences of the respective variables have been reviewed and none
of them relied on the counting up mechanism, but all of them were
using the variable as a true boolean.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 builtin/fsck.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 9909b6d..39fa5e8 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -611,15 +611,15 @@ static char const * const fsck_usage[] = {
 
 static struct option fsck_opts[] = {
 	OPT__VERBOSE(&verbose, N_("be verbose")),
-	OPT_BOOLEAN(0, "unreachable", &show_unreachable, N_("show unreachable objects")),
+	OPT_BOOL(0, "unreachable", &show_unreachable, N_("show unreachable objects")),
 	OPT_BOOL(0, "dangling", &show_dangling, N_("show dangling objects")),
-	OPT_BOOLEAN(0, "tags", &show_tags, N_("report tags")),
-	OPT_BOOLEAN(0, "root", &show_root, N_("report root nodes")),
-	OPT_BOOLEAN(0, "cache", &keep_cache_objects, N_("make index objects head nodes")),
-	OPT_BOOLEAN(0, "reflogs", &include_reflogs, N_("make reflogs head nodes (default)")),
-	OPT_BOOLEAN(0, "full", &check_full, N_("also consider packs and alternate objects")),
-	OPT_BOOLEAN(0, "strict", &check_strict, N_("enable more strict checking")),
-	OPT_BOOLEAN(0, "lost-found", &write_lost_and_found,
+	OPT_BOOL(0, "tags", &show_tags, N_("report tags")),
+	OPT_BOOL(0, "root", &show_root, N_("report root nodes")),
+	OPT_BOOL(0, "cache", &keep_cache_objects, N_("make index objects head nodes")),
+	OPT_BOOL(0, "reflogs", &include_reflogs, N_("make reflogs head nodes (default)")),
+	OPT_BOOL(0, "full", &check_full, N_("also consider packs and alternate objects")),
+	OPT_BOOL(0, "strict", &check_strict, N_("enable more strict checking")),
+	OPT_BOOL(0, "lost-found", &write_lost_and_found,
 				N_("write dangling objects in .git/lost-found")),
 	OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
 	OPT_END(),
-- 
1.8.4.rc0.1.g8f6a3e5

Re: [PATCH] fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL

[Junio C Hamano]

Stefan Beller <stefanbeller@googlemail.com> writes:

> This task emerged from b04ba2bb4.
> All occurrences of the respective variables have been reviewed and none
> of them relied on the counting up mechanism, but all of them were
> using the variable as a true boolean.
>
> Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
> ---

Looked correct; thanks.


>  builtin/fsck.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/builtin/fsck.c b/builtin/fsck.c
> index 9909b6d..39fa5e8 100644
> --- a/builtin/fsck.c
> +++ b/builtin/fsck.c
> @@ -611,15 +611,15 @@ static char const * const fsck_usage[] = {
>  
>  static struct option fsck_opts[] = {
>  	OPT__VERBOSE(&verbose, N_("be verbose")),
> -	OPT_BOOLEAN(0, "unreachable", &show_unreachable, N_("show unreachable objects")),
> +	OPT_BOOL(0, "unreachable", &show_unreachable, N_("show unreachable objects")),
>  	OPT_BOOL(0, "dangling", &show_dangling, N_("show dangling objects")),
> -	OPT_BOOLEAN(0, "tags", &show_tags, N_("report tags")),
> -	OPT_BOOLEAN(0, "root", &show_root, N_("report root nodes")),
> -	OPT_BOOLEAN(0, "cache", &keep_cache_objects, N_("make index objects head nodes")),
> -	OPT_BOOLEAN(0, "reflogs", &include_reflogs, N_("make reflogs head nodes (default)")),
> -	OPT_BOOLEAN(0, "full", &check_full, N_("also consider packs and alternate objects")),
> -	OPT_BOOLEAN(0, "strict", &check_strict, N_("enable more strict checking")),
> -	OPT_BOOLEAN(0, "lost-found", &write_lost_and_found,
> +	OPT_BOOL(0, "tags", &show_tags, N_("report tags")),
> +	OPT_BOOL(0, "root", &show_root, N_("report root nodes")),
> +	OPT_BOOL(0, "cache", &keep_cache_objects, N_("make index objects head nodes")),
> +	OPT_BOOL(0, "reflogs", &include_reflogs, N_("make reflogs head nodes (default)")),
> +	OPT_BOOL(0, "full", &check_full, N_("also consider packs and alternate objects")),
> +	OPT_BOOL(0, "strict", &check_strict, N_("enable more strict checking")),
> +	OPT_BOOL(0, "lost-found", &write_lost_and_found,
>  				N_("write dangling objects in .git/lost-found")),
>  	OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
>  	OPT_END(),