There were a number of problems with t1000-branch-create:
* It assumed that refs were not packed. I added calls to show-ref to
spot any packed refs.
* It reused the same name for several consecutive branch creation
tests. This causes a domino effect if one of the subtests fail. I
made the subtests use different names.
* It tried to make sure that we couldn't create a branch if there
was a broken ref by the same name. Unfortunately that test fails
-- we don't create the branch, but we point HEAD to it. This
causes many subsequent operations to fail. I marked this test as a
known failure, and added some reset code so that subsequent
subtests don't die because of this.
Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx>
---
Thanks to Junio for suggesting that the test should be repaired rather
than deleted. It finds a real bug! (A rather harmless one, but still.)
t/t1000-branch-create.sh | 56 ++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/t/t1000-branch-create.sh b/t/t1000-branch-create.sh
index d6cf34a..5a097a4 100755
--- a/t/t1000-branch-create.sh
+++ b/t/t1000-branch-create.sh
@@ -21,65 +21,81 @@ test_expect_success \
'Create a spurious patches/ entry' '
stg branch master &&
stg init &&
- find .git -name foo | xargs rm -rf &&
- mkdir -p .git/patches && touch .git/patches/foo
+ mkdir -p .git/patches && touch .git/patches/foo1
'
test_expect_success \
'Try to create an stgit branch with a spurious patches/ entry' '
- ! stg branch -c foo
+ ! stg branch -c foo1
'
test_expect_success \
'Check that no part of the branch was created' '
- test "`find .git -name foo | tee /dev/stderr`" = ".git/patches/foo" &&
- ( grep foo .git/HEAD; test $? = 1 )
+ 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 \
'Create a git branch' '
- find .git -name foo | xargs rm -rf &&
- cp .git/refs/heads/master .git/refs/heads/foo
+ git update-ref refs/heads/foo2 refs/heads/master
'
test_expect_success \
'Try to create an stgit branch with an existing git branch by that name' '
- ! stg branch -c foo
+ ! stg branch -c foo2
'
test_expect_success \
'Check that 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 )
+ 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' '
- find .git -name foo | xargs rm -rf &&
- touch .git/refs/heads/foo &&
- ! stg branch -c foo
+ touch .git/refs/heads/foo3 &&
+ ! 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 a.c a.o &&
- git add a.c a.o &&
+ touch file1 file2 &&
+ git add file1 file2 &&
git commit -m 1 &&
- git rm a.c a.o &&
+ git rm file1 file2 &&
git commit -m 2 &&
- touch a.o
+ touch file2
'
test_expect_success \
'Create branch down the stack, behind the conflict caused by the generated file' '
- ! stg branch --create bar master^
+ ! stg branch --create foo4 master^
'
test_expect_success \
'Check the branch was not created' '
- test ! -r .git/refs/heads/bar &&
- test ! -r a.c
+ 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
--
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
