Skip to content

Commit

Permalink
Merge branch 'rs/simplify-archive-tests'
Browse files Browse the repository at this point in the history
* rs/simplify-archive-tests:
  t5000, t5003: simplify commit
  • Loading branch information
Junio C Hamano committed Jul 10, 2014
2 parents b41a463 + 21711ca commit df4d7d5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
12 changes: 4 additions & 8 deletions t/t5000-tar-tree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
12 changes: 4 additions & 8 deletions t/t5003-archive-zip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit df4d7d5

Please sign in to comment.