projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make t4101-apply-nonl bring along its patches
[git.git]
/
t
/
t4101-apply-nonl.sh
diff --git
a/t/t4101-apply-nonl.sh
b/t/t4101-apply-nonl.sh
index
26b131d
..
026fac8
100755
(executable)
--- a/
t/t4101-apply-nonl.sh
+++ b/
t/t4101-apply-nonl.sh
@@
-20,14
+20,10
@@
do
for j in 0 1 2 3
do
test $i -eq $j && continue
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" \
cat frotz.$i >frotz
test_expect_success \
"apply diff between $i and $j" \
- "git-apply <diff.$i-$j && diff frotz.$j frotz"
+ "git-apply <
../t4101/
diff.$i-$j && diff frotz.$j frotz"
done
done
done
done