repo.or.cz
/
git
/
peff.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Documentation: Add definition of "evil merge" to GIT Glossary
[git/peff.git]
/
t
/
t4120-apply-popt.sh
blob
2f672f30d424ace13d24236a0a9e90324cb2b4da
1
#!/bin/sh
2
#
3
# Copyright (c) 2007 Shawn O. Pearce
4
#
5
6
test_description
=
'git-apply -p handling.'
7
8
. .
/
test-lib.sh
9
10
test_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
21
test_expect_success
'apply git diff with -p2'
'
22
git apply -p2 patch.file
23
'
24
25
test_done