X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/baf8241d1b7835ba31125d2b75683601ee2b0403..d0329a7785d86495fd02ca595d9cb94fc67cdf4d:/t/t1800-import.sh diff --git a/t/t1800-import.sh b/t/t1800-import.sh index ecaa593..93de794 100755 --- a/t/t1800-import.sh +++ b/t/t1800-import.sh @@ -22,6 +22,33 @@ test_expect_success \ ' 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 &&