diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 13:02:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 13:02:44 (GMT) |
| commit | 8d676d85f772ce3a100b6f0dddd1c34a7e4313cf (patch) | |
| tree | b6fa143842fc72a3bb2079dfdb66f30ce5126319 /t/t0000-basic.sh | |
| parent | 919e06b2288270f47c55759e8810b87f74609caf (diff) | |
| parent | 5e87eae97df69a48a575fd79131e85067f9dbf13 (diff) | |
| download | git-8d676d85f772ce3a100b6f0dddd1c34a7e4313cf.zip git-8d676d85f772ce3a100b6f0dddd1c34a7e4313cf.tar.gz git-8d676d85f772ce3a100b6f0dddd1c34a7e4313cf.tar.bz2 | |
Merge branch 'gv/portable'
* gv/portable:
test-lib: use DIFF definition from GIT-BUILD-OPTIONS
build: propagate $DIFF to scripts
Makefile: Tru64 portability fix
Makefile: HP-UX 10.20 portability fixes
Makefile: HPUX11 portability fixes
Makefile: SunOS 5.6 portability fix
inline declaration does not work on AIX
Allow disabling "inline"
Some platforms lack socklen_t type
Make NO_{INET_NTOP,INET_PTON} configured independently
Makefile: some platforms do not have hstrerror anywhere
git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
test_cmp: do not use "diff -u" on platforms that lack one
fixup: do not unconditionally disable "diff -u"
tests: use "test_cmp", not "diff", when verifying the result
Do not use "diff" found on PATH while building and installing
enums: omit trailing comma for portability
Makefile: -lpthread may still be necessary when libc has only pthread stubs
Rewrite dynamic structure initializations to runtime assignment
Makefile: pass CPPFLAGS through to fllow customization
Conflicts:
Makefile
wt-status.h
Diffstat (limited to 't/t0000-basic.sh')
| -rwxr-xr-x | t/t0000-basic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 3ec9cbe..f2c7336 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -301,7 +301,7 @@ $expectfilter >expected <<\EOF EOF test_expect_success \ 'validate git diff-files output for a know cache/work tree state.' \ - 'git diff-files >current && diff >/dev/null -b current expected' + 'git diff-files >current && test_cmp current expected >/dev/null' test_expect_success \ 'git update-index --refresh should succeed.' \ |