diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2010-02-25 21:03:44 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-25 12:27:38 -0800 |
| commit | 3fdcdbdf301dadb7af58fe038501f0af6419a2e0 (patch) | |
| tree | a93e6858dfc1b9db2bd6fd71eff8a3ece8d2f9d5 /t/t6023-merge-file.sh | |
| parent | 251a4951a20b23760c3ccf3f3122d4394ab37357 (diff) | |
| download | git-3fdcdbdf301dadb7af58fe038501f0af6419a2e0.tar.gz git-3fdcdbdf301dadb7af58fe038501f0af6419a2e0.tar.xz | |
Windows: redirect f[re]open("/dev/null") to f[re]open("nul")
On Windows, the equivalent of "/dev/null" is "nul". This implements
compatibility wrappers around fopen() and freopen() that check for this
particular file name.
The new tests exercise code paths where this is relevant.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
| -rwxr-xr-x | t/t6023-merge-file.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index 6291307cd..d605024cf 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -64,6 +64,10 @@ cp new1.txt test.txt test_expect_success "merge without conflict" \ "git merge-file test.txt orig.txt new2.txt" +cp new1.txt test.txt +test_expect_success "merge without conflict (--quiet)" \ + "git merge-file --quiet test.txt orig.txt new2.txt" + cp new1.txt test2.txt test_expect_success "merge without conflict (missing LF at EOF)" \ "git merge-file test2.txt orig.txt new2.txt" |