diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:11:17 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:11:17 -0400 |
| commit | e75c55844fd0ff96d00173574b1e49cc472ca928 (patch) | |
| tree | 1146c04d598cdb0857e9072e82eee2338f8ee4a4 /builtin-config.c | |
| parent | Teach core.autocrlf to 'git blame' (diff) | |
| parent | Yet more 1.5.3.5 fixes mentioned in release notes (diff) | |
| download | tgif-e75c55844fd0ff96d00173574b1e49cc472ca928.tar.xz | |
Merge branch 'maint'
* maint:
Yet more 1.5.3.5 fixes mentioned in release notes
cvsserver: Use exit 1 instead of die when req_Root fails.
git-blame shouldn't crash if run in an unmerged tree
git-config: print error message if the config file cannot be read
fixing output of non-fast-forward output of post-receive-email
Diffstat (limited to 'builtin-config.c')
| -rw-r--r-- | builtin-config.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin-config.c b/builtin-config.c index d98b6c2c4c..e5e243f27c 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -175,7 +175,10 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[1], "--list") || !strcmp(argv[1], "-l")) { if (argc != 2) usage(git_config_set_usage); - return git_config(show_all_config); + if (git_config(show_all_config) < 0 && file && errno) + die("unable to read config file %s: %s", file, + strerror(errno)); + return 0; } else if (!strcmp(argv[1], "--global")) { char *home = getenv("HOME"); |