Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
revision --simplify-merges: use decoration instead of commit->util field
[gitweb.git]
/
t
/
t5500-fetch-pack.sh
diff --git
a/t/t5500-fetch-pack.sh
b/t/t5500-fetch-pack.sh
index 140e8745811b9f25abfa2c9c24a0569f8dd39c66..362cf7e928090fb3752936317f78a4d128810127 100755
(executable)
--- a/
t/t5500-fetch-pack.sh
+++ b/
t/t5500-fetch-pack.sh
@@
-177,6
+177,6
@@
test_expect_success "clone shallow object count" \
"test \"count: 18\" = \"$(grep count count.shallow)\""
test_expect_success "pull in shallow repo with missing merge base" \
- "(cd shallow &&
!
git pull --depth 4 .. A)"
+ "(cd shallow &&
test_must_fail
git pull --depth 4 .. A)"
test_done