Fix refs.c;:repack_without_ref() clean-up path

diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 2cc03e6fd578be0a619d73b00389566ded7694cd..f31e79c561fd1adee699850d0e78755314c4c2ee 100755 (executable)
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -37,12 +37,12 @@ test_expect_success \
      git-show-ref b >result &&
      diff expect result'
 
-# test_expect_failure \
-#     'git branch c/d should barf if branch c exists' \
-#     'git-branch c &&
-#      git-pack-refs &&
-#      rm .git/refs/heads/c &&
-#      git-branch c/d'
+test_expect_failure \
+    'git branch c/d should barf if branch c exists' \
+    'git-branch c &&
+     git-pack-refs &&
+     rm .git/refs/heads/c &&
+     git-branch c/d'
 
 test_expect_success \
     'see if a branch still exists after git pack-refs --prune' \
@@ -67,4 +67,31 @@ test_expect_success \
      git-pack-refs &&
      git-branch -d g'
 
+test_expect_failure \
+    'git branch i/j/k should barf if branch i exists' \
+    'git-branch i &&
+     git-pack-refs --prune &&
+     git-branch i/j/k'
+
+test_expect_success \
+    'test git branch k after branch k/l/m and k/lm have been deleted' \
+    'git-branch k/l &&
+     git-branch k/lm &&
+     git-branch -d k/l &&
+     git-branch k/l/m &&
+     git-branch -d k/l/m &&
+     git-branch -d k/lm &&
+     git-branch k'
+
+test_expect_success \
+    'test git branch n after some branch deletion and pruning' \
+    'git-branch n/o &&
+     git-branch n/op &&
+     git-branch -d n/o &&
+     git-branch n/o/p &&
+     git-branch -d n/op &&
+     git-pack-refs --prune &&
+     git-branch -d n/o/p &&
+     git-branch n'
+
 test_done