t / t4101-apply-nonl.shon commit Merge branch 'jc/denoise-rm-to-resolve' (5e9d978)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='git apply should handle files with incomplete lines.
   7
   8'
   9. ./test-lib.sh
  10
  11# setup
  12
  13(echo a; echo b) >frotz.0
  14(echo a; echo b; echo c) >frotz.1
  15(echo a; echo b | tr -d '\012') >frotz.2
  16(echo a; echo c; echo b | tr -d '\012') >frotz.3
  17
  18for i in 0 1 2 3
  19do
  20  for j in 0 1 2 3
  21  do
  22    test $i -eq $j && continue
  23    cat frotz.$i >frotz
  24    test_expect_success "apply diff between $i and $j" '
  25        git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
  26        test_cmp frotz.$j frotz
  27    '
  28  done
  29done
  30
  31test_done