From: Karl Hasselström <kha@xxxxxxxxxxx> Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx> --- t/t1301-assimilate.sh | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/t/t1301-assimilate.sh b/t/t1301-assimilate.sh new file mode 100755 index 0000000..26b263c --- /dev/null +++ b/t/t1301-assimilate.sh @@ -0,0 +1,86 @@ +#!/bin/sh +# Copyright (c) 2006 Karl Hasselström +test_description='Test the assimilate command.' +. ./test-lib.sh + +test_expect_success \ + 'Assimilate in a non-initialized repository' \ + 'stg assimilate' + +test_expect_success \ + 'Initialize the StGIT repository' \ + 'stg init' + +test_expect_success \ + 'Assimilate in a repository without patches' \ + 'stg assimilate' + +test_expect_success \ + 'Create a patch' \ + ' + stg new foo -m foo && + echo foo > foo.txt && + stg add foo.txt && + stg refresh + ' + +test_expect_success \ + 'Assimilate when there is nothing to do' \ + 'stg assimilate' + +test_expect_success \ + 'Create a GIT commit' \ + ' + echo bar > bar.txt && + git add bar.txt && + git commit -a -m bar + ' + +test_expect_success \ + 'Assimilate one GIT commit' \ + ' + [ $(stg applied | wc -l) -eq 1 ] && + stg assimilate && + [ $(stg applied | wc -l) -eq 2 ] + ' + +test_expect_success \ + 'Create three more GIT commits' \ + ' + echo one > numbers.txt && + git add numbers.txt && + git commit -a -m one && + echo two >> numbers.txt && + git commit -a -m two && + echo three >> numbers.txt && + git commit -a -m three + ' + +test_expect_success \ + 'Assimilate three GIT commits' \ + ' + [ $(stg applied | wc -l) -eq 2 ] && + stg assimilate && + [ $(stg applied | wc -l) -eq 5 ] + ' + +test_expect_success \ + 'Create a mege commit' \ + ' + git checkout -b br master^^ && + echo woof > woof.txt && + git add woof.txt && + git commit -a -m woof && + git checkout master && + git pull . br + ' + +test_expect_success \ + 'Try (and fail) to assimilate the merge commit' \ + ' + [ $(stg applied | wc -l) -eq 5 ] && + ! stg assimilate && + [ $(stg applied | wc -l) -eq 5 ] + ' + +test_done - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html