It currently can't; therefore, the tests are marked as known failures. Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx> --- t/t2800-goto-subdir.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) create mode 100755 t/t2800-goto-subdir.sh diff --git a/t/t2800-goto-subdir.sh b/t/t2800-goto-subdir.sh new file mode 100755 index 0000000..9f3ab26 --- /dev/null +++ b/t/t2800-goto-subdir.sh @@ -0,0 +1,59 @@ +#!/bin/sh + +test_description='Run "stg goto" in a subdirectory' + +. ./test-lib.sh + +test_expect_success 'Initialize StGit stack' ' + stg init && + echo expected1.txt >> .git/info/exclude && + echo expected2.txt >> .git/info/exclude && + echo actual.txt >> .git/info/exclude && + mkdir foo && + for i in 1 2 3; do + echo foo$i >> foo/bar && + stg new p$i -m p$i && + git add foo/bar && + stg refresh + done +' + +cat > expected1.txt <<EOF +foo1 +EOF +cat > expected2.txt <<EOF +bar +EOF +test_expect_failure 'Goto in subdirectory (just pop)' ' + (cd foo && stg goto p1) && + cat foo/bar > actual.txt && + diff -u expected1.txt actual.txt && + ls foo > actual.txt && + diff -u expected2.txt actual.txt +' + +test_expect_success 'Prepare conflicting goto' ' + stg delete p2 +' + +cat > expected1.txt <<EOF +foo1 +<<<<<<< current:foo/bar +======= +foo2 +foo3 +>>>>>>> patched:foo/bar +EOF +cat > expected2.txt <<EOF +bar +EOF +test_expect_failure 'Goto in subdirectory (conflicting push)' ' + (cd foo && stg goto p3) ; + [ $? -eq 3 ] && + cat foo/bar > actual.txt && + diff -u expected1.txt actual.txt && + ls foo > actual.txt && + diff -u expected2.txt actual.txt +' + +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
