Andrew's git / gitweb.git / t/t4109-apply-multifrag.sh
?
t / t4109-apply-multifrag.shon commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4# Copyright (c) 2005 Robert Fitzsimons
   5#
   6
   7test_description='git apply test patches with multiple fragments.'
   8
   9. ./test-lib.sh
  10
  11cp "$TEST_DIRECTORY/t4109/patch1.patch" .
  12cp "$TEST_DIRECTORY/t4109/patch2.patch" .
  13cp "$TEST_DIRECTORY/t4109/patch3.patch" .
  14cp "$TEST_DIRECTORY/t4109/patch4.patch" .
  15
  16test_expect_success 'git apply (1)' '
  17        git apply patch1.patch patch2.patch &&
  18        test_cmp "$TEST_DIRECTORY/t4109/expect-1" main.c
  19'
  20rm -f main.c
  21
  22test_expect_success 'git apply (2)' '
  23        git apply patch1.patch patch2.patch patch3.patch &&
  24        test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c
  25'
  26rm -f main.c
  27
  28test_expect_success 'git apply (3)' '
  29        git apply patch1.patch patch4.patch &&
  30        test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
  31'
  32mv main.c main.c.git
  33
  34test_done
  35