diff options
author | Junio C Hamano <junkio@cox.net> | 2007-03-10 23:26:33 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-10 23:26:33 -0800 |
commit | cf6981d4932007555689052cbc255b911674b01c (patch) | |
tree | 780cfe523171d98ecded8e4d8509db507707e1f3 /t/t9100-git-svn-basic.sh | |
parent | 8509fed75d576023f5f2db8542fad102fcc62d4d (diff) | |
parent | 5bd74506cd30e897d1493639b7438c6cc80dea8e (diff) | |
download | git-cf6981d4932007555689052cbc255b911674b01c.tar.gz git-cf6981d4932007555689052cbc255b911674b01c.tar.xz |
Merge branch 'js/diff-ni'
* js/diff-ni:
Get rid of the dependency to GNU diff in the tests
diff --no-index: support /dev/null as filename
diff-ni: fix the diff with standard input
diff: support reading a file from stdin via "-"
Diffstat (limited to 't/t9100-git-svn-basic.sh')
-rwxr-xr-x | t/t9100-git-svn-basic.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 7dcfc7e7d..eb628fe07 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -169,7 +169,7 @@ test_expect_success "$name" " svn up '$SVN_TREE' && test -f '$SVN_TREE'/exec-2.sh && test ! -L '$SVN_TREE'/exec-2.sh && - diff -u help $SVN_TREE/exec-2.sh" + git diff help $SVN_TREE/exec-2.sh" if test "$have_utf8" = t then @@ -193,7 +193,7 @@ test_expect_success "$name" \ "git-svn init $svnrepo && git-svn fetch && git-rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a && git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b && - diff -u a b" + git diff a b" name='check imported tree checksums expected tree checksums' rm -f expected @@ -211,7 +211,7 @@ tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4 EOF -test_expect_success "$name" "diff -u a expected" +test_expect_success "$name" "git diff a expected" test_expect_failure 'exit if remote refs are ambigious' " git-config --add svn-remote.svn.fetch \ |