diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:23:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:23:31 -0700 |
| commit | 633142d86874ee8ce79a23ee4346f32e6271faad (patch) | |
| tree | 8096e26f84075d3aae42d13fe0b76c2a5f2ea07c /builtin/config.c | |
| parent | 693fefe3d022767975eec7585561bfe178b873f4 (diff) | |
| parent | 41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd (diff) | |
| download | git-633142d86874ee8ce79a23ee4346f32e6271faad.tar.gz | |
Merge branch 'jn/paginate-fix'
* jn/paginate-fix:
t7006 (pager): add missing TTY prerequisites
merge-file: run setup_git_directory_gently() sooner
var: run setup_git_directory_gently() sooner
ls-remote: run setup_git_directory_gently() sooner
index-pack: run setup_git_directory_gently() sooner
config: run setup_git_directory_gently() sooner
bundle: run setup_git_directory_gently() sooner
apply: run setup_git_directory_gently() sooner
grep: run setup_git_directory_gently() sooner
shortlog: run setup_git_directory_gently() sooner
git wrapper: allow setup_git_directory_gently() be called earlier
setup: remember whether repository was found
git wrapper: introduce startup_info struct
Conflicts:
builtin/index-pack.c
Diffstat (limited to 'builtin/config.c')
| -rw-r--r-- | builtin/config.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/config.c b/builtin/config.c index 79fee767b8..ca4a0db4a7 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -331,11 +331,10 @@ static int get_colorbool(int print) return get_colorbool_found ? 0 : 1; } -int cmd_config(int argc, const char **argv, const char *unused_prefix) +int cmd_config(int argc, const char **argv, const char *prefix) { - int nongit; + int nongit = !startup_info->have_repository; char *value; - const char *prefix = setup_git_directory_gently(&nongit); config_exclusive_filename = getenv(CONFIG_ENVIRONMENT); |