git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-03 02:27:35 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

fixup! tests: replace mingw_test_cmp with a helper in C

Browse Source
This commit is contained in:
Johannes Schindelin
2018-06-22 11:16:23 +02:00
parent 63f4efb914
commit cd1a74fc9d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/helper/test-cmp.c
View File

@@ -11,7 +11,10 @@ static int run_diff(const char *path1, const char *path2)
"diff", "--no-index", NULL, NULL, NULL
};
const char *env[] = {
"GIT_PAGER=cat", NULL
"GIT_PAGER=cat",
"GIT_DIR=/dev/null",
"HOME=/dev/null",
NULL
};
argv[2] = path1;
@@ -48,7 +51,10 @@ int cmd__cmp(int argc, const char **argv)
if (r1 == EOF)
return 0;
cmp_failed:
return !!run_diff(argv[1], argv[2]);
if (!run_diff(argv[1], argv[2]))
die("Huh? 'diff --no-index %s %s' succeeded",
argv[1], argv[2]);
return 1;
}
if (r1 == EOF || strbuf_cmp(&b0, &b1)) {
fclose(f0);