+ touch .git/refs/heads/foo3 &&
+ command_error stg branch -c foo3
+'
+
+test_expect_failure \
+ '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 \
+ 'Setup two commits including removal of generated files' '
+ git init &&
+ touch file1 file2 &&
+ stg add file1 file2 &&
+ git commit -m 1 &&
+ stg rm file1 file2 &&
+ git commit -m 2 &&
+ touch file2
+'
+
+test_expect_success \
+ 'Create branch down the stack, behind the conflict caused by the generated file' '
+ command_error stg branch --create foo4 master^
+'
+
+test_expect_success \
+ '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"