undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scalar-[un]register: clearly indicate source of error

Browse Source 
When a step in 'register_dir()' or 'unregister_dir()' fails, indicate which
step failed with an error message, rather than silently assigning a nonzero
return code.

Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Victoria Dye 2022-08-18 21:40:48 +00:00 committed by Junio C Hamano
parent adedcee811
commit d2a79bc953
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/scalar/scalar.c
View File

@ -208,15 +208,16 @@ static int add_or_remove_enlistment(int add)
static int register_dir(void) static int register_dir(void)
{ {
int res = add_or_remove_enlistment(1); if (add_or_remove_enlistment(1))
return error(_("could not add enlistment"));
if (!res) if (set_recommended_config(0))
res = set_recommended_config(0); return error(_("could not set recommended config"));
if (!res) if (toggle_maintenance(1))
res = toggle_maintenance(1); return error(_("could not turn on maintenance"));
return res; return 0;
} }
static int unregister_dir(void) static int unregister_dir(void)
@ -224,10 +225,10 @@ static int unregister_dir(void)
int res = 0; int res = 0;
if (toggle_maintenance(0)) if (toggle_maintenance(0))
res = -1; res = error(_("could not turn off maintenance"));
if (add_or_remove_enlistment(0)) if (add_or_remove_enlistment(0))
res = -1; res = error(_("could not remove enlistment"));
return res; return res;
} }