'Initialize the StGIT repository' \
'
cp ../t1800-import/foo.txt . &&
- git add foo.txt &&
+ stg add foo.txt &&
git commit -a -m "initial version" &&
stg init
'
'
test_expect_success \
+ 'Apply a patch created with "git diff" using -p1' \
+ '
+ stg import -p1 ../t1800-import/git-diff &&
+ [ $(git cat-file -p $(stg id) \
+ | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
+ stg delete ..
+ '
+
+test_expect_success \
+ 'Apply a patch created with "git diff" using -p0' \
+ '
+ stg import -p0 ../t1800-import/git-diff-p0 &&
+ [ $(git cat-file -p $(stg id) \
+ | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
+ stg delete ..
+ '
+
+test_expect_success \
+ 'Apply a patch created with "git diff" using -p2' \
+ '
+ ! stg import -p2 ../t1800-import/git-diff &&
+ [ $(git cat-file -p $(stg id) \
+ | grep -c "tree a5850c97490398571d41d6304dd940800550f507") = 1 ] &&
+ stg delete ..
+ '
+
+test_expect_success \
'Apply a patch created with "git diff" from a subdirectory' \
'
mkdir subdir && cd subdir &&
'apply a series from a tarball' \
'
rm -f jabberwocky.txt && touch jabberwocky.txt &&
- git add jabberwocky.txt && git commit -m "empty file" jabberwocky.txt &&
+ stg add jabberwocky.txt && git commit -m "empty file" jabberwocky.txt &&
(cd ../t1800-import; tar -cjf jabberwocky.tar.bz2 patches) &&
stg import --series ../t1800-import/jabberwocky.tar.bz2
[ $(git cat-file -p $(stg id) \