Revision c578a09bd6310157ea69bb1d2ec2d3d2cc58c85a authored by Armin Kunaschik on 02 July 2016, 19:01:51 UTC, committed by Junio C Hamano on 06 July 2016, 19:18:09 UTC
mktemp is not available on all platforms, so the test 'temporary filenames are used with mergetool.writeToTemp' fails there. This patch does not replace mktemp but just disables the test that otherwise would fail. mergetool checks itself before executing mktemp and reports an error. Signed-off-by: Armin Kunaschik <megabreit@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2ff7dff
| File | Mode | Size |
|---|---|---|
| nedmalloc | ||
| poll | ||
| regex | ||
| vcbuild | ||
| win32 | ||
| apple-common-crypto.h | -rw-r--r-- | 2.7 KB |
| basename.c | -rw-r--r-- | 1.3 KB |
| bswap.h | -rw-r--r-- | 4.6 KB |
| fopen.c | -rw-r--r-- | 931 bytes |
| gmtime.c | -rw-r--r-- | 605 bytes |
| hstrerror.c | -rw-r--r-- | 530 bytes |
| inet_ntop.c | -rw-r--r-- | 4.8 KB |
| inet_pton.c | -rw-r--r-- | 6.8 KB |
| memmem.c | -rw-r--r-- | 752 bytes |
| mingw.c | -rw-r--r-- | 58.2 KB |
| mingw.h | -rw-r--r-- | 14.2 KB |
| mkdir.c | -rw-r--r-- | 468 bytes |
| mkdtemp.c | -rw-r--r-- | 153 bytes |
| mmap.c | -rw-r--r-- | 692 bytes |
| msvc.c | -rw-r--r-- | 113 bytes |
| msvc.h | -rw-r--r-- | 570 bytes |
| obstack.c | -rw-r--r-- | 13.8 KB |
| obstack.h | -rw-r--r-- | 19.1 KB |
| pread.c | -rw-r--r-- | 433 bytes |
| precompose_utf8.c | -rw-r--r-- | 4.6 KB |
| precompose_utf8.h | -rw-r--r-- | 1.3 KB |
| qsort.c | -rw-r--r-- | 1.2 KB |
| setenv.c | -rw-r--r-- | 862 bytes |
| sha1-chunked.c | -rw-r--r-- | 362 bytes |
| sha1-chunked.h | -rw-r--r-- | 81 bytes |
| snprintf.c | -rw-r--r-- | 1.5 KB |
| stat.c | -rw-r--r-- | 1.1 KB |
| strcasestr.c | -rw-r--r-- | 431 bytes |
| strlcpy.c | -rw-r--r-- | 247 bytes |
| strtoimax.c | -rw-r--r-- | 214 bytes |
| strtoumax.c | -rw-r--r-- | 217 bytes |
| terminal.c | -rw-r--r-- | 2.5 KB |
| terminal.h | -rw-r--r-- | 142 bytes |
| unsetenv.c | -rw-r--r-- | 591 bytes |
| win32.h | -rw-r--r-- | 878 bytes |
| win32mmap.c | -rw-r--r-- | 1.1 KB |
| winansi.c | -rw-r--r-- | 15.1 KB |
Computing file changes ...
