diff options
| author | Damien Diederen <dash@foobox.net> | 2008-03-28 01:18:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-28 02:05:27 +0300 |
| commit | 6e8937a084927867df4d90c75b2619f2b4b0df18 (patch) | |
| tree | 6489c8e015ded45720e92bd236267a6e37dd4c22 /t/t9400-git-cvsserver-server.sh | |
| parent | e78f69a3f2e580e71a44b91fa99185bc6f92db29 (diff) | |
cvsserver: Add test for update -p
Signed-off-by: Damien Diederen <dash@foobox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9400-git-cvsserver-server.sh')
| -rwxr-xr-x | t/t9400-git-cvsserver-server.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 616832407f..166b43f783 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -420,6 +420,24 @@ test_expect_success 'cvs update (merge no-op)' \ GIT_CONFIG="$git_config" cvs -Q update && diff -q merge ../merge' +cd "$WORKDIR" +test_expect_success 'cvs update (-p)' ' + touch really-empty && + echo Line 1 > no-lf && + echo -n Line 2 >> no-lf && + git add really-empty no-lf && + git commit -q -m "Update -p test" && + git push gitcvs.git >/dev/null && + cd cvswork && + GIT_CONFIG="$git_config" cvs update && + rm -f failures && + for i in merge no-lf empty really-empty; do + GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out + diff $i.out ../$i >>failures 2>&1 + done && + test -z "$(cat failures)" +' + #------------ # CVS STATUS #------------ |