Skip to content

Commit

Permalink
diff.c: Use 'git_config_string' to get 'diff.external'
Browse files Browse the repository at this point in the history
Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brian Hetro authored and Junio C Hamano committed Jul 6, 2008
1 parent cd8be6c commit daec808
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,8 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
diff_auto_refresh_index = git_config_bool(var, value);
return 0;
}
if (!strcmp(var, "diff.external")) {
if (!value)
return config_error_nonbool(var);
external_diff_cmd_cfg = xstrdup(value);
return 0;
}
if (!strcmp(var, "diff.external"))
return git_config_string(&external_diff_cmd_cfg, var, value);
if (!prefixcmp(var, "diff.")) {
const char *ep = strrchr(var, '.');

Expand Down

0 comments on commit daec808

Please sign in to comment.