undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  t/README: clarify test_must_fail description
  Check size of path buffer before writing into it

Conflicts:
	t/README
This commit is contained in:
Junio C Hamano 2010-07-20 11:29:30 -07:00
commit 5f7baac1e3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.c
View File

@ -170,6 +170,8 @@ static int is_git_directory(const char *suspect)
char path[PATH_MAX]; char path[PATH_MAX];
size_t len = strlen(suspect); size_t len = strlen(suspect);
if (PATH_MAX <= len + strlen("/objects"))
die("Too long path: %.*s", 60, suspect);
strcpy(path, suspect); strcpy(path, suspect);
if (getenv(DB_ENVIRONMENT)) { if (getenv(DB_ENVIRONMENT)) {
if (access(getenv(DB_ENVIRONMENT), X_OK)) if (access(getenv(DB_ENVIRONMENT), X_OK))

6
t/README
View File

@ -451,8 +451,10 @@ library for your script to use.
- test_must_fail <git-command> - test_must_fail <git-command>
Run a git command and ensure it fails in a controlled way. Use Run a git command and ensure it fails in a controlled way. Use
this instead of "! <git-command>" to fail when git commands this instead of "! <git-command>". When git-command dies due to a
segfault. segfault, test_must_fail diagnoses it as an error; "! <git-command>"
treats it as just another expected failure, which would let such a
bug go unnoticed.
- test_might_fail <git-command> - test_might_fail <git-command>