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

apply: make init_apply_state() return -1 instead of exit()ing

Browse Source 
To libify `git apply` functionality we have to signal errors to the
caller instead of exit()ing.

To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", init_apply_state() should return -1 instead of
calling exit().

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2016-08-08 23:03:08 +02:00 committed by Junio C Hamano
parent bb493a5c14
commit 2f5a6d1218
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apply.c
View File

@ -55,9 +55,9 @@ int parse_ignorewhitespace_option(struct apply_state *state,
return error(_("unrecognized whitespace ignore option '%s'"), option); return error(_("unrecognized whitespace ignore option '%s'"), option);
} }
void init_apply_state(struct apply_state *state, int init_apply_state(struct apply_state *state,
const char *prefix, const char *prefix,
struct lock_file *lock_file) struct lock_file *lock_file)
{ {
memset(state, 0, sizeof(*state)); memset(state, 0, sizeof(*state));
state->prefix = prefix; state->prefix = prefix;
@ -79,9 +79,10 @@ void init_apply_state(struct apply_state *state,
git_apply_config(); git_apply_config();
if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace)) if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace))
exit(1); return -1;
if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace)) if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace))
exit(1); return -1;
return 0;
} }
void clear_apply_state(struct apply_state *state) void clear_apply_state(struct apply_state *state)

6
apply.h
View File

@ -102,9 +102,9 @@ extern int parse_whitespace_option(struct apply_state *state,
extern int parse_ignorewhitespace_option(struct apply_state *state, extern int parse_ignorewhitespace_option(struct apply_state *state,
const char *option); const char *option);
extern void init_apply_state(struct apply_state *state, extern int init_apply_state(struct apply_state *state,
const char *prefix, const char *prefix,
struct lock_file *lock_file); struct lock_file *lock_file);
extern void clear_apply_state(struct apply_state *state); extern void clear_apply_state(struct apply_state *state);
#endif #endif

3
builtin/apply.c
View File

@ -4741,7 +4741,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
OPT_END() OPT_END()
}; };
init_apply_state(&state, prefix, &lock_file); if (init_apply_state(&state, prefix, &lock_file))
exit(128);
argc = parse_options(argc, argv, state.prefix, builtin_apply_options, argc = parse_options(argc, argv, state.prefix, builtin_apply_options,
apply_usage, 0); apply_usage, 0);