Merge branch 'master' into next

gitster · gitster · commit 1ebd5b5b7687 · 2011-11-21T14:30:53.000-08:00
* master:
  convert.c: Fix return type of git_path_check_eol()
  documentation fix: git difftool uses diff tools, not merge tools.
  config.c: Fix a static buffer overwrite bug by avoiding mkpath()
  t5501-*.sh: Fix url passed to clone in setup test
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
@@ -31,7 +31,7 @@ OPTIONS
 -t <tool>::
 --tool=<tool>::
 	Use the diff tool specified by <tool>.
-	Valid merge tools are:
+	Valid diff tools are:
 	araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
 	kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
 +
diff --git a/config.c b/config.c
@@ -886,12 +886,12 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
 
 	home = getenv("HOME");
 	if (home) {
-		char *user_config = xstrdup(mkpath("%s/.gitconfig", home));
+		char buf[PATH_MAX];
+		char *user_config = mksnpath(buf, sizeof(buf), "%s/.gitconfig", home);
 		if (!access(user_config, R_OK)) {
 			ret += git_config_from_file(fn, user_config, data);
 			found += 1;
 		}
-		free(user_config);
 	}
 
 	if (repo_config && !access(repo_config, R_OK)) {
diff --git a/convert.c b/convert.c
@@ -658,7 +658,7 @@ static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_ch
 	return CRLF_GUESS;
 }
 
-static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
+static enum eol git_path_check_eol(const char *path, struct git_attr_check *check)
 {
 	const char *value = check->value;
 
diff --git a/t/t5501-fetch-push-alternates.sh b/t/t5501-fetch-push-alternates.sh
@@ -28,7 +28,7 @@ test_expect_success setup '
 		done
 	) &&
 	(
-		git clone --reference=original "file:///$(pwd)/original" one &&
+		git clone --reference=original "file://$(pwd)/original" one &&
 		cd one &&
 		echo Z >count &&
 		git add count &&

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ OPTIONS`
`31`	`31`	`-t <tool>::`
`32`	`32`	`--tool=<tool>::`
`33`	`33`	`Use the diff tool specified by <tool>.`
`34`		`- Valid merge tools are:`
	`34`	`+ Valid diff tools are:`
`35`	`35`	`araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,`
`36`	`36`	`kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.`
`37`	`37`	`+`
Original file line number	Diff line number	Diff line change
`@@ -886,12 +886,12 @@ int git_config_early(config_fn_t fn, void data, const char repo_config)`
`886`	`886`
`887`	`887`	`home = getenv("HOME");`
`888`	`888`	`if (home) {`
`889`		`- char *user_config = xstrdup(mkpath("%s/.gitconfig", home));`
	`889`	`+ char buf[PATH_MAX];`
	`890`	`+ char *user_config = mksnpath(buf, sizeof(buf), "%s/.gitconfig", home);`
`890`	`891`	`if (!access(user_config, R_OK)) {`
`891`	`892`	`ret += git_config_from_file(fn, user_config, data);`
`892`	`893`	`found += 1;`
`893`	`894`	`}`
`894`		`- free(user_config);`
`895`	`895`	`}`
`896`	`896`
`897`	`897`	`if (repo_config && !access(repo_config, R_OK)) {`
Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_ch`
`658`	`658`	`return CRLF_GUESS;`
`659`	`659`	`}`
`660`	`660`
`661`		`-static enum crlf_action git_path_check_eol(const char path, struct git_attr_check check)`
	`661`	`+static enum eol git_path_check_eol(const char path, struct git_attr_check check)`
`662`	`662`	`{`
`663`	`663`	`const char *value = check->value;`
`664`	`664`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ test_expect_success setup '`
`28`	`28`	`done`
`29`	`29`	`) &&`
`30`	`30`	`(`
`31`		`- git clone --reference=original "file:///$(pwd)/original" one &&`
	`31`	`+ git clone --reference=original "file://$(pwd)/original" one &&`
`32`	`32`	`cd one &&`
`33`	`33`	`echo Z >count &&`
`34`	`34`	`git add count &&`