projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'se/tag'
[git.git]
/
t
/
t5000-tar-tree.sh
diff --git
a/t/t5000-tar-tree.sh
b/t/t5000-tar-tree.sh
index
6d72ed3
..
278eb66
100755
(executable)
--- a/
t/t5000-tar-tree.sh
+++ b/
t/t5000-tar-tree.sh
@@
-25,6
+25,7
@@
commit id embedding:
'
. ./test-lib.sh
'
. ./test-lib.sh
+TAR=${TAR:-tar}
test_expect_success \
'populate workdir' \
test_expect_success \
'populate workdir' \
@@
-33,16
+34,19
@@
test_expect_success \
mkdir a/bin &&
cp /bin/sh a/bin &&
ln -s a a/l1 &&
mkdir a/bin &&
cp /bin/sh a/bin &&
ln -s a a/l1 &&
+ (p=long_path_to_a_file && cd a &&
+ for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
+ echo text >file_with_long_path) &&
(cd a && find .) | sort >a.lst'
test_expect_success \
'add files to repository' \
(cd a && find .) | sort >a.lst'
test_expect_success \
'add files to repository' \
- 'find a -type f | xargs git-update-
cache
--add &&
- find a -type l | xargs git-update-
cache
--add &&
+ '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 &&
treeid=`git-write-tree` &&
echo $treeid >treeid &&
-
TZ=
GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
- git-commit-tree $treeid </dev/null
>.git/HEAD
'
+
git-update-ref HEAD $(TZ=GMT
GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
+ git-commit-tree $treeid </dev/null
)
'
test_expect_success \
'git-tar-tree' \
test_expect_success \
'git-tar-tree' \
@@
-50,7
+54,7
@@
test_expect_success \
test_expect_success \
'validate file modification time' \
test_expect_success \
'validate file modification time' \
- 'TZ=
tar
tvf b.tar a/a |
+ 'TZ=
GMT $TAR
tvf b.tar a/a |
awk \{print\ \$4,\ \(length\(\$5\)\<7\)\ ?\ \$5\":00\"\ :\ \$5\} \
>b.mtime &&
echo "2005-05-27 22:00:00" >expected.mtime &&
awk \{print\ \$4,\ \(length\(\$5\)\<7\)\ ?\ \$5\":00\"\ :\ \$5\} \
>b.mtime &&
echo "2005-05-27 22:00:00" >expected.mtime &&
@@
-59,11
+63,11
@@
test_expect_success \
test_expect_success \
'git-get-tar-commit-id' \
'git-get-tar-commit-id <b.tar >b.commitid &&
test_expect_success \
'git-get-tar-commit-id' \
'git-get-tar-commit-id <b.tar >b.commitid &&
- diff .git/
HEAD
b.commitid'
+ diff .git/
$(git-symbolic-ref HEAD)
b.commitid'
test_expect_success \
'extract tar archive' \
test_expect_success \
'extract tar archive' \
- '(cd b &&
tar
xf -) <b.tar'
+ '(cd b &&
$TAR
xf -) <b.tar'
test_expect_success \
'validate filenames' \
test_expect_success \
'validate filenames' \
@@
-80,7
+84,7
@@
test_expect_success \
test_expect_success \
'extract tar archive with prefix' \
test_expect_success \
'extract tar archive with prefix' \
- '(cd c &&
tar
xf -) <c.tar'
+ '(cd c &&
$TAR
xf -) <c.tar'
test_expect_success \
'validate filenames with prefix' \
test_expect_success \
'validate filenames with prefix' \