Skip to content

Commit

Permalink
builtin-apply.c: use git_config_string() to get apply_default_whitespace
Browse files Browse the repository at this point in the history
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Stephan Beyer authored and Junio C Hamano committed Apr 15, 2008
1 parent c35b0b5 commit 8e4c6aa
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions builtin-apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -2981,12 +2981,8 @@ static int apply_patch(int fd, const char *filename, int inaccurate_eof)

static int git_apply_config(const char *var, const char *value)
{
if (!strcmp(var, "apply.whitespace")) {
if (!value)
return config_error_nonbool(var);
apply_default_whitespace = xstrdup(value);
return 0;
}
if (!strcmp(var, "apply.whitespace"))
return git_config_string(&apply_default_whitespace, var, value);
return git_default_config(var, value);
}

Expand Down

0 comments on commit 8e4c6aa

Please sign in to comment.