Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 3a75f674017fdf86d8b742cdfeb0df8700a2d03a authored by Junio C Hamano on 20 January 2006, 02:32:54 UTC
GIT 1.0.12
Tip revision: 3a75f67
t4101-apply-nonl.sh
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='git-apply should handle files with incomplete lines.

'
. ./test-lib.sh

# setup

(echo a; echo b) >frotz.0
(echo a; echo b; echo c) >frotz.1
(echo a; echo b | tr -d '\012') >frotz.2
(echo a; echo c; echo b | tr -d '\012') >frotz.3

for i in 0 1 2 3
do
  for j in 0 1 2 3
  do
    test $i -eq $j && continue
    diff -u frotz.$i frotz.$j |
    sed -e '
	/^---/s|.*|--- a/frotz|
	/^+++/s|.*|+++ b/frotz|' >diff.$i-$j
    cat frotz.$i >frotz
    test_expect_success \
        "apply diff between $i and $j" \
	"git-apply <diff.$i-$j && diff frotz.$j frotz"
  done
done

test_done
back to top