aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-05 17:54:12 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-05 17:54:12 -0800
commit8abc61880d34f7a85928d7ca95cb1165b2aca1df (patch)
treed3a65f515a86df9f0822ee59b37b07e7d3f8784e /t
parent8c4c286c394cc383577bf884f37a708bba98549e (diff)
parentb2a6d1c6868b6d5e7d2b4fa9129341220a1e848a (diff)
downloadgit-8abc61880d34f7a85928d7ca95cb1165b2aca1df.tar.gz
git-8abc61880d34f7a85928d7ca95cb1165b2aca1df.tar.xz
Merge branch 'js/maint-all-implies-HEAD' into maint
* js/maint-all-implies-HEAD: bundle: allow the same ref to be given more than once revision walker: include a detached HEAD in --all
Diffstat (limited to 't')
-rwxr-xr-xt/t5701-clone-local.sh4
-rwxr-xr-xt/t6014-rev-list-all.sh38
2 files changed, 40 insertions, 2 deletions
diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh
index 8dfaaa456..fe0fda282 100755
--- a/t/t5701-clone-local.sh
+++ b/t/t5701-clone-local.sh
@@ -11,8 +11,8 @@ test_expect_success 'preparing origin repository' '
git clone --bare . x &&
test "$(GIT_CONFIG=a.git/config git config --bool core.bare)" = true &&
test "$(GIT_CONFIG=x/config git config --bool core.bare)" = true
- git bundle create b1.bundle --all HEAD &&
- git bundle create b2.bundle --all &&
+ git bundle create b1.bundle --all &&
+ git bundle create b2.bundle master &&
mkdir dir &&
cp b1.bundle dir/b3
cp b1.bundle b4
diff --git a/t/t6014-rev-list-all.sh b/t/t6014-rev-list-all.sh
new file mode 100755
index 000000000..991ab4a65
--- /dev/null
+++ b/t/t6014-rev-list-all.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+test_description='--all includes detached HEADs'
+
+. ./test-lib.sh
+
+
+commit () {
+ test_tick &&
+ echo $1 > foo &&
+ git add foo &&
+ git commit -m "$1"
+}
+
+test_expect_success 'setup' '
+
+ commit one &&
+ commit two &&
+ git checkout HEAD^ &&
+ commit detached
+
+'
+
+test_expect_success 'rev-list --all lists detached HEAD' '
+
+ test 3 = $(git rev-list --all | wc -l)
+
+'
+
+test_expect_success 'repack does not lose detached HEAD' '
+
+ git gc &&
+ git prune --expire=now &&
+ git show HEAD
+
+'
+
+test_done