diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-18 21:48:32 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-18 21:48:32 -0700 |
commit | 42d504248830452275dbe1c864f0b1771d7b1a05 (patch) | |
tree | 011c7f094bfcdd41f510461c720485c8fbf1791e /t/annotate-tests.sh | |
parent | Merge branch 'master' into next (diff) | |
parent | Support for extracting configuration from different files (diff) | |
download | tgif-42d504248830452275dbe1c864f0b1771d7b1a05.tar.xz |
Merge branch 'pb/config' into next
* pb/config:
Support for extracting configuration from different files
Fix PPC SHA1 routine for large input buffers
Make t8001-annotate and t8002-blame more portable
Remove "refs" field from "struct object"
Make release tarballs friendlier to older tar versions
Diffstat (limited to 't/annotate-tests.sh')
-rw-r--r-- | t/annotate-tests.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 114938c3ff..c04f0e1540 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -111,9 +111,7 @@ test_expect_success \ test_expect_success \ 'some edit' \ - 'mv file file1 && - sed -e 1d -e "5s/3A/99/" file1 >file && - rm -f file1 && + 'perl -pi -e "s/^1A.*\n$//; s/^3A/99/" file && GIT_AUTHOR_NAME="D" git commit -a -m "edit"' test_expect_success \ |