cvsserver: Add test for update -p
Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Damien Diederen committed
Mar 27, 2008 at 23:18 UTC
6e8937a084927867df4d90c75b2619f2b4b0df18
1 file changed
+18
t/t9400-git-cvsserver-server.sh
+18
@@ -420,6 +420,24 @@ test_expect_success 'cvs update (merge no-op)' \
420
GIT_CONFIG="$git_config" cvs -Q update &&
421
diff -q merge ../merge'
422
423
+cd "$WORKDIR"
424
+test_expect_success 'cvs update (-p)' '
425
+ touch really-empty &&
426
+ echo Line 1 > no-lf &&
427
+ echo -n Line 2 >> no-lf &&
428
+ git add really-empty no-lf &&
429
+ git commit -q -m "Update -p test" &&
430
+ git push gitcvs.git >/dev/null &&
431
+ cd cvswork &&
432
+ GIT_CONFIG="$git_config" cvs update &&
433
+ rm -f failures &&
434
+ for i in merge no-lf empty really-empty; do
435
+ GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out
436
+ diff $i.out ../$i >>failures 2>&1
437
+ done &&
438
+ test -z "$(cat failures)"
439
+'
440
+
441
#------------
442
# CVS STATUS
443
#------------