diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:47:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:47:29 -0700 |
| commit | b19beecd9456a2e6282634e5df751206b972604a (patch) | |
| tree | 52617650de39f12bbeb351acf7fb5c9b5becf5cb /t | |
| parent | 474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9 (diff) | |
| parent | 1f1e895fccc52a1e227c464c4558d74604301a9f (diff) | |
| download | git-b19beecd9456a2e6282634e5df751206b972604a.tar.gz git-b19beecd9456a2e6282634e5df751206b972604a.tar.xz | |
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.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index c04f0e154..1148b0257 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 \ |