diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-10 18:27:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-10 18:27:54 (GMT) |
| commit | df4d7d56461c19361a6f32b633e850c7ba6e55e6 (patch) | |
| tree | 5ad52b7142533637d7e1f014e4ec7165f787153b /t | |
| parent | b41a4636eea8961e88f107818a68513f847b6fd3 (diff) | |
| parent | 21711ca4b2a387b587c90e0ad8a98170e4b006e4 (diff) | |
| download | git-df4d7d56461c19361a6f32b633e850c7ba6e55e6.zip git-df4d7d56461c19361a6f32b633e850c7ba6e55e6.tar.gz git-df4d7d56461c19361a6f32b633e850c7ba6e55e6.tar.bz2 | |
Merge branch 'rs/simplify-archive-tests'
* rs/simplify-archive-tests:
t5000, t5003: simplify commit
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5000-tar-tree.sh | 12 | ||||
| -rwxr-xr-x | t/t5003-archive-zip.sh | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 899c1c5..7b8babd 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -119,14 +119,10 @@ test_expect_success \ 'echo ignore me >a/ignored && echo ignored export-ignore >.git/info/attributes' -test_expect_success \ - 'add files to repository' \ - 'find a -type f | xargs git update-index --add && - find a -type l | xargs git update-index --add && - treeid=$(git write-tree) && - echo $treeid >treeid && - git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ - git commit-tree $treeid </dev/null)' +test_expect_success 'add files to repository' ' + git add a && + GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial +' test_expect_success 'setup export-subst' ' echo "substfile?" export-subst >>.git/info/attributes && diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index 21a5c93..c929db5 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -61,14 +61,10 @@ test_expect_success \ 'echo ignore me >a/ignored && echo ignored export-ignore >.git/info/attributes' -test_expect_success \ - 'add files to repository' \ - 'find a -type f | xargs git update-index --add && - find a -type l | xargs git update-index --add && - treeid=`git write-tree` && - echo $treeid >treeid && - git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ - git commit-tree $treeid </dev/null)' +test_expect_success 'add files to repository' ' + git add a && + GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial +' test_expect_success 'setup export-subst' ' echo "substfile?" export-subst >>.git/info/attributes && |