summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-13 21:31:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-07-13 21:31:36 (GMT)
commit551d75dbd80cb6af08376ea8a12bdaa3f5860f35 (patch)
tree006ba5c9799ef415c5531bfd122f0899823b351a /compat
parentbc50897b90177f03c74e53467d1b62aec74789c5 (diff)
parent924aaf3ef764a5e8e976f68e024ecacf54ff6306 (diff)
downloadgit-551d75dbd80cb6af08376ea8a12bdaa3f5860f35.zip
git-551d75dbd80cb6af08376ea8a12bdaa3f5860f35.tar.gz
git-551d75dbd80cb6af08376ea8a12bdaa3f5860f35.tar.bz2
Merge branch 'rj/config-cygwin'
* rj/config-cygwin: config.c: Make git_config() work correctly when called recursively t1301-*.sh: Fix the 'forced modes' test on cygwin help.c: Fix detection of custom merge strategy on cygwin
Diffstat (limited to 'compat')
-rw-r--r--compat/cygwin.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/compat/cygwin.c b/compat/cygwin.c
index b4a51b9..b38dbd7 100644
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@ -114,8 +114,7 @@ static int git_cygwin_config(const char *var, const char *value, void *cb)
static int init_stat(void)
{
- if (have_git_dir()) {
- git_config(git_cygwin_config, NULL);
+ if (have_git_dir() && git_config(git_cygwin_config,NULL)) {
if (!core_filemode && native_stat) {
cygwin_stat_fn = cygwin_stat;
cygwin_lstat_fn = cygwin_lstat;