summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-20 01:47:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-20 01:47:29 (GMT)
commitb19beecd9456a2e6282634e5df751206b972604a (patch)
tree52617650de39f12bbeb351acf7fb5c9b5becf5cb /t
parent474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9 (diff)
parent1f1e895fccc52a1e227c464c4558d74604301a9f (diff)
downloadgit-b19beecd9456a2e6282634e5df751206b972604a.zip
git-b19beecd9456a2e6282634e5df751206b972604a.tar.gz
git-b19beecd9456a2e6282634e5df751206b972604a.tar.bz2
Merge branch 'lt/objlist' into next
* lt/objlist: Add "named object array" concept xdiff: minor changes to match libxdiff-0.21 fix rfc2047 formatter. Fix t8001-annotate and t8002-blame for ActiveState Perl Add specialized object allocator
Diffstat (limited to 't')
-rw-r--r--t/annotate-tests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index c04f0e1..1148b02 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -111,7 +111,7 @@ test_expect_success \
test_expect_success \
'some edit' \
- 'perl -pi -e "s/^1A.*\n$//; s/^3A/99/" file &&
+ 'perl -p -i.orig -e "s/^1A.*\n$//; s/^3A/99/" file &&
GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
test_expect_success \