. ./test-lib.sh
-stg init
+test_expect_success \
+ 'Create a branch when the current one is not an StGIT stack' '
+ git branch origin &&
+ stg branch --create new origin &&
+ test $(stg branch) = "new"
+'
-test_expect_failure \
- 'Try to create an stgit branch with a spurious refs/patches/ entry' \
- 'find .git -name foo | xargs rm -rf &&
- touch .git/refs/patches/foo &&
- stg branch -c foo
+test_expect_success \
+ 'Create a spurious patches/ entry' '
+ stg branch master &&
+ stg init &&
+ mkdir -p .git/patches && touch .git/patches/foo1
'
test_expect_success \
- 'Check no part of the branch was created' \
- 'test "`find .git -name foo | tee /dev/stderr`" = ".git/refs/patches/foo" &&
- ( grep foo .git/HEAD; test $? = 1 )
+ 'Try to create an stgit branch with a spurious patches/ entry' '
+ ! stg branch -c foo1
'
-test_expect_failure \
- 'Try to create an stgit branch with a spurious patches/ entry' \
- 'find .git -name foo | xargs rm -rf &&
- touch .git/patches/foo &&
- stg branch -c foo
+test_expect_success \
+ 'Check that no part of the branch was created' '
+ test "$(find .git -name foo1 | tee /dev/stderr)" = ".git/patches/foo1" &&
+ test "$(git show-ref | grep foo1 | wc -l)" = 0 &&
+ test "$(git symbolic-ref HEAD)" = "refs/heads/master"
'
test_expect_success \
- 'Check no part of the branch was created' \
- 'test "`find .git -name foo | tee /dev/stderr`" = ".git/patches/foo" &&
- ( grep foo .git/HEAD; test $? = 1 )
+ 'Create a git branch' '
+ git update-ref refs/heads/foo2 refs/heads/master
'
-test_expect_failure \
- 'Try to create an stgit branch with a spurious refs/bases/ entry' \
- 'find .git -name foo | xargs rm -rf &&
- touch .git/refs/bases/foo &&
- stg branch -c foo
+test_expect_success \
+ 'Try to create an stgit branch with an existing git branch by that name' '
+ ! stg branch -c foo2
'
test_expect_success \
- 'Check no part of the branch was created' \
- 'test "`find .git -name foo | tee /dev/stderr`" = ".git/refs/bases/foo" &&
- ( grep foo .git/HEAD; test $? = 1 )
+ 'Check that no part of the branch was created' '
+ test "$(find .git -name foo2 | tee /dev/stderr \
+ | grep -v ^\\.git/refs/heads/foo2$ \
+ | grep -v ^\\.git/logs/refs/heads/foo2$ | wc -l)" = 0 &&
+ test "$(git show-ref | grep foo2 | wc -l)" = 1 &&
+ test "$(git symbolic-ref HEAD)" = "refs/heads/master"
'
+test_expect_success \
+ 'Create an invalid refs/heads/ entry' '
+ touch .git/refs/heads/foo3 &&
+ ! stg branch -c foo3
+'
test_expect_failure \
- 'Try to create an stgit branch with an existing git branch by that name' \
- 'find .git -name foo | xargs rm -rf &&
- cp .git/refs/heads/master .git/refs/heads/foo &&
- stg branch -c foo
+ 'Check that no part of the branch was created' '
+ test "$(find .git -name foo3 | tee /dev/stderr \
+ | grep -v ^\\.git/refs/heads/foo3$ | wc -l)" = 0 &&
+ test "$(git show-ref | grep foo3 | wc -l)" = 0 &&
+ test "$(git symbolic-ref HEAD)" = "refs/heads/master"
'
+# Workaround for the test failure to make the rest of the subtests
+# succeed. (HEAD was erroneously overwritten with the bad foo3 ref, so
+# we need to reset it.)
+git symbolic-ref HEAD refs/heads/master
+
test_expect_success \
- 'Check no part of the branch was created' \
- 'test "`find .git -name foo | tee /dev/stderr`" = ".git/refs/heads/foo" &&
- ( grep foo .git/HEAD; test $? = 1 )
+ 'Setup two commits including removal of generated files' '
+ git init &&
+ touch file1 file2 &&
+ git add file1 file2 &&
+ git commit -m 1 &&
+ git rm file1 file2 &&
+ git commit -m 2 &&
+ touch file2
'
-
-test_expect_failure \
- 'Try to create an stgit branch with an invalid refs/heads/ entry' \
- 'find .git -name foo | xargs rm -rf &&
- touch .git/refs/heads/foo &&
- stg branch -c foo
+test_expect_success \
+ 'Create branch down the stack, behind the conflict caused by the generated file' '
+ ! stg branch --create foo4 master^
'
test_expect_success \
- 'Check no part of the branch was created' \
- 'test "`find .git -name foo | tee /dev/stderr`" = ".git/refs/heads/foo" &&
- ( grep foo .git/HEAD; test $? = 1 )
+ 'Check the branch was not created' '
+ test ! -e file1 &&
+ test "$(find .git -name foo4 | tee /dev/stderr | wc -l)" = 0 &&
+ test "$(git show-ref | grep foo4 | wc -l)" = 0 &&
+ test "$(git symbolic-ref HEAD)" = "refs/heads/master"
'
test_done