Merge branch 'ua/call-repo-config-with-possibly-null-repository'
Since a call to repo_config() can be called with repo set to NULL these days, a command that is marked as RUN_SETUP in the builtin command table does not have to check repo with NULL before making the call. * ua/call-repo-config-with-possibly-null-repository: builtin/difftool: remove unnecessary if statement builtin/add: remove unnecessary if statementmain
commit
a501213402
|
@ -386,7 +386,6 @@ int cmd_add(int argc,
|
|||
char *ps_matched = NULL;
|
||||
struct lock_file lock_file = LOCK_INIT;
|
||||
|
||||
if (repo)
|
||||
repo_config(repo, add_config, NULL);
|
||||
|
||||
argc = parse_options(argc, argv, prefix, builtin_add_options,
|
||||
|
|
|
@ -753,7 +753,6 @@ int cmd_difftool(int argc,
|
|||
};
|
||||
struct child_process child = CHILD_PROCESS_INIT;
|
||||
|
||||
if (repo)
|
||||
repo_config(repo, difftool_config, &dt_options);
|
||||
dt_options.symlinks = dt_options.has_symlinks;
|
||||
|
||||
|
|
Loading…
Reference in New Issue