Merge branch 'jk/missing-config'

gitster · gitster · commit 6f49ed6153be · 2010-11-17T15:02:08.000-08:00
* jk/missing-config:
  config: treat non-existent config files as empty
diff --git a/config.c b/config.c
@@ -871,9 +871,7 @@ int git_config(config_fn_t fn, void *data)
 	if (config_parameters)
 		found += 1;
 
-	if (found == 0)
-		return -1;
-	return ret;
+	return ret == 0 ? found : ret;
 }
 
 /*
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
@@ -288,6 +288,14 @@ EOF
 test_expect_success 'working --list' \
 	'git config --list > output && cmp output expect'
 
+cat > expect << EOF
+EOF
+
+test_expect_success '--list without repo produces empty output' '
+	git --git-dir=nonexistent config --list >output &&
+	test_cmp expect output
+'
+
 cat > expect << EOF
 beta.noindent sillyValue
 nextsection.nonewline wow2 for me
@@ -836,6 +844,27 @@ test_expect_success SYMLINKS 'symlinked configuration' '
 
 '
 
+test_expect_success 'nonexistent configuration' '
+	(
+		GIT_CONFIG=doesnotexist &&
+		export GIT_CONFIG &&
+		test_must_fail git config --list &&
+		test_must_fail git config test.xyzzy
+	)
+'
+
+test_expect_success SYMLINKS 'symlink to nonexistent configuration' '
+	ln -s doesnotexist linktonada &&
+	ln -s linktonada linktolinktonada &&
+	(
+		GIT_CONFIG=linktonada &&
+		export GIT_CONFIG &&
+		test_must_fail git config --list &&
+		GIT_CONFIG=linktolinktonada &&
+		test_must_fail git config --list
+	)
+'
+
 test_expect_success 'check split_cmdline return' "
 	git config alias.split-cmdline-fix 'echo \"' &&
 	test_must_fail git split-cmdline-fix &&

Original file line number	Diff line number	Diff line change
`@@ -871,9 +871,7 @@ int git_config(config_fn_t fn, void *data)`
`871`	`871`	`if (config_parameters)`
`872`	`872`	`found += 1;`
`873`	`873`
`874`		`- if (found == 0)`
`875`		`- return -1;`
`876`		`- return ret;`
	`874`	`+ return ret == 0 ? found : ret;`
`877`	`875`	`}`
`878`	`876`
`879`	`877`	`/*`