Merge branch 'maint'

[git.git] / t / t3210-pack-refs.sh

diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index f31e79c561fd1adee699850d0e78755314c4c2ee..f0c7e22b36c66234e2a46bac659506afb454dfa7 100755 (executable)
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -11,6 +11,8 @@ semantic is still the same.
 '
 . ./test-lib.sh
 
+echo '[core] logallrefupdates = true' >>.git/config
+
 test_expect_success \
     'prepare a trivial repository' \
     'echo Hello > A &&
@@ -23,7 +25,7 @@ SHA1=
 test_expect_success \
     'see if git show-ref works as expected' \
     'git-branch a &&
-     SHA1=$(< .git/refs/heads/a) &&
+     SHA1=`cat .git/refs/heads/a` &&
      echo "$SHA1 refs/heads/a" >expect &&
      git-show-ref a >result &&
      diff expect result'
@@ -31,8 +33,8 @@ test_expect_success \
 test_expect_success \
     'see if a branch still exists when packed' \
     'git-branch b &&
-     git-pack-refs &&
-     rm .git/refs/heads/b &&
+     git-pack-refs --all &&
+     rm -f .git/refs/heads/b &&
      echo "$SHA1 refs/heads/b" >expect &&
      git-show-ref b >result &&
      diff expect result'
@@ -40,14 +42,14 @@ test_expect_success \
 test_expect_failure \
     'git branch c/d should barf if branch c exists' \
     'git-branch c &&
-     git-pack-refs &&
+     git-pack-refs --all &&
      rm .git/refs/heads/c &&
      git-branch c/d'
 
 test_expect_success \
     'see if a branch still exists after git pack-refs --prune' \
     'git-branch e &&
-     git-pack-refs --prune &&
+     git-pack-refs --all --prune &&
      echo "$SHA1 refs/heads/e" >expect &&
      git-show-ref e >result &&
      diff expect result'
@@ -55,22 +57,22 @@ test_expect_success \
 test_expect_failure \
     'see if git pack-refs --prune remove ref files' \
     'git-branch f &&
-     git-pack-refs --prune &&
+     git-pack-refs --all --prune &&
      ls .git/refs/heads/f'
 
 test_expect_success \
     'git branch g should work when git branch g/h has been deleted' \
     'git-branch g/h &&
-     git-pack-refs --prune &&
+     git-pack-refs --all --prune &&
      git-branch -d g/h &&
      git-branch g &&
-     git-pack-refs &&
+     git-pack-refs --all &&
      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-pack-refs --all --prune &&
      git-branch i/j/k'
 
 test_expect_success \
@@ -90,8 +92,17 @@ test_expect_success \
      git-branch -d n/o &&
      git-branch n/o/p &&
      git-branch -d n/op &&
-     git-pack-refs --prune &&
+     git-pack-refs --all --prune &&
      git-branch -d n/o/p &&
      git-branch n'
 
+test_expect_success 'pack, prune and repack' '
+       git-tag foo &&
+       git-pack-refs --all --prune &&
+       git-show-ref >all-of-them &&
+       git-pack-refs &&
+       git-show-ref >again &&
+       diff all-of-them again
+'
+
 test_done