kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

MinGW: fix diff --no-index /dev/null ... 

When launching "diff --no-index" with a parameter "/dev/null", the MSys
bash converts the "/dev/null" to a "nul", which usually makes sense.  But

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2009-03-07 16:51:33 +01:00 committed by Junio C Hamano
parent 3b167396b4
commit 36adb4abbd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff-no-index.c
View File

@ -38,6 +38,10 @@ static int get_mode(const char *path, int *mode)


if (!path || !strcmp(path, "/dev/null")) if (!path || !strcmp(path, "/dev/null"))
*mode = 0; *mode = 0;
#ifdef _WIN32
else if (!strcasecmp(path, "nul"))
*mode = 0;
#endif
else if (!strcmp(path, "-")) else if (!strcmp(path, "-"))
*mode = create_ce_mode(0666); *mode = create_ce_mode(0666);
else if (lstat(path, &st)) else if (lstat(path, &st))

2
t/t4012-diff-binary.sh
View File

@ -87,7 +87,7 @@ nul_to_q() {


test_expect_success 'diff --no-index with binary creation' ' test_expect_success 'diff --no-index with binary creation' '
echo Q | q_to_nul >binary && echo Q | q_to_nul >binary &&
(:# hide error code from diff, which just indicates differences (: hide error code from diff, which just indicates differences
git diff --binary --no-index /dev/null binary >current || git diff --binary --no-index /dev/null binary >current ||
true true
) && ) &&