~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document shortcoming of stg-k and stg-unnew.
[stgit]
/
t
/
t1800-import.sh
diff --git
a/t/t1800-import.sh
b/t/t1800-import.sh
index
0c1baa3
..
8c8c9a0
100755
(executable)
--- a/
t/t1800-import.sh
+++ b/
t/t1800-import.sh
@@
-6,9
+6,7
@@
test_description='Test the import command'
test_expect_success \
'Initialize the StGIT repository' \
'
test_expect_success \
'Initialize the StGIT repository' \
'
- for x in {do,di,da}{be,bi,bo}{dam,dim,dum}; do
- echo $x
- done > foo.txt &&
+ cp ../t1800-import/foo.txt . &&
git add foo.txt &&
git commit -a -m "initial version" &&
stg init
git add foo.txt &&
git commit -a -m "initial version" &&
stg init
@@
-19,7
+17,7
@@
test_expect_success \
'
stg import ../t1800-import/git-diff &&
[ $(git cat-file -p $(stg id) \
'
stg import ../t1800-import/git-diff &&
[ $(git cat-file -p $(stg id) \
- | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") =
=
1 ] &&
+ | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
stg delete ..
'
@@
-28,7
+26,7
@@
test_expect_success \
'
stg import ../t1800-import/gnu-diff &&
[ $(git cat-file -p $(stg id) \
'
stg import ../t1800-import/gnu-diff &&
[ $(git cat-file -p $(stg id) \
- | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") =
=
1 ] &&
+ | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
stg delete ..
'
@@
-37,7
+35,7
@@
test_expect_success \
'
stg import ../t1800-import/stg-export &&
[ $(git cat-file -p $(stg id) \
'
stg import ../t1800-import/stg-export &&
[ $(git cat-file -p $(stg id) \
- | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") =
=
1 ] &&
+ | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
stg delete ..
'
stg delete ..
'
@@
-46,9
+44,9
@@
test_expect_success \
'
stg import -m ../t1800-import/email-8bit &&
[ $(git cat-file -p $(stg id) \
'
stg import -m ../t1800-import/email-8bit &&
[ $(git cat-file -p $(stg id) \
- | grep -c "tree 030be42660323ff2a1958f9ee79589a4f3fbee2f") =
=
1 ] &&
+ | grep -c "tree 030be42660323ff2a1958f9ee79589a4f3fbee2f") = 1 ] &&
[ $(git cat-file -p $(stg id) \
[ $(git cat-file -p $(stg id) \
- | grep -c "author Inge Ström <inge@power.com>") =
=
1 ] &&
+ | grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
stg delete ..
'
@@
-57,9
+55,9
@@
test_expect_success \
'
stg import -m ../t1800-import/email-qp &&
[ $(git cat-file -p $(stg id) \
'
stg import -m ../t1800-import/email-qp &&
[ $(git cat-file -p $(stg id) \
- | grep -c "tree 030be42660323ff2a1958f9ee79589a4f3fbee2f") =
=
1 ] &&
+ | grep -c "tree 030be42660323ff2a1958f9ee79589a4f3fbee2f") = 1 ] &&
[ $(git cat-file -p $(stg id) \
[ $(git cat-file -p $(stg id) \
- | grep -c "author Inge Ström <inge@power.com>") =
=
1 ] &&
+ | grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
stg delete ..
'
@@
-68,17
+66,17
@@
test_expect_success \
'
stg import -M ../t1800-import/email-mbox &&
[ $(git cat-file -p $(stg id change-1) \
'
stg import -M ../t1800-import/email-mbox &&
[ $(git cat-file -p $(stg id change-1) \
- | grep -c "tree 401bef82cd9fb403aba18f480a63844416a2e023") =
=
1 ] &&
+ | grep -c "tree 401bef82cd9fb403aba18f480a63844416a2e023") = 1 ] &&
[ $(git cat-file -p $(stg id change-1) \
[ $(git cat-file -p $(stg id change-1) \
- | grep -c "author Inge Ström <inge@power.com>") =
=
1 ] &&
+ | grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
[ $(git cat-file -p $(stg id change-2) \
- | grep -c "tree e49dbce010ec7f441015a8c64bce0b99108af4cc") =
=
1 ] &&
+ | grep -c "tree e49dbce010ec7f441015a8c64bce0b99108af4cc") = 1 ] &&
[ $(git cat-file -p $(stg id change-2) \
[ $(git cat-file -p $(stg id change-2) \
- | grep -c "author Inge Ström <inge@power.com>") =
=
1 ] &&
+ | grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
[ $(git cat-file -p $(stg id change-3) \
[ $(git cat-file -p $(stg id change-3) \
- | grep -c "tree 166bbaf27a44aee21ba78c98822a741e6f7d78f5") =
=
1 ] &&
+ | grep -c "tree 166bbaf27a44aee21ba78c98822a741e6f7d78f5") = 1 ] &&
[ $(git cat-file -p $(stg id change-3) \
[ $(git cat-file -p $(stg id change-3) \
- | grep -c "author Inge Ström <inge@power.com>") =
=
1 ] &&
+ | grep -c "author Inge Ström <inge@power.com>") = 1 ] &&
stg delete ..
'
stg delete ..
'