t / t4120-apply-popt.shon commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1#!/bin/sh
   2#
   3# Copyright (c) 2007 Shawn O. Pearce
   4#
   5
   6test_description='git apply -p handling.'
   7
   8. ./test-lib.sh
   9
  10test_expect_success setup '
  11        mkdir sub &&
  12        echo A >sub/file1 &&
  13        cp sub/file1 file1 &&
  14        git add sub/file1 &&
  15        echo B >sub/file1 &&
  16        git diff >patch.file &&
  17        rm sub/file1 &&
  18        rmdir sub
  19'
  20
  21test_expect_success 'apply git diff with -p2' '
  22        git apply -p2 patch.file
  23'
  24
  25test_expect_success 'apply with too large -p' '
  26        test_must_fail git apply --stat -p3 patch.file 2>err &&
  27        grep "removing 3 leading" err
  28'
  29
  30test_done