Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/diff-color-move-more'
[gitweb.git]
/
t
/
t5500-fetch-pack.sh
diff --git
a/t/t5500-fetch-pack.sh
b/t/t5500-fetch-pack.sh
index 3d33ab3875383f4f71b486bfd3f2fce342e00474..0f0fefad1e94097831dd5f9894c200454a9e1da9 100755
(executable)
--- a/
t/t5500-fetch-pack.sh
+++ b/
t/t5500-fetch-pack.sh
@@
-259,7
+259,7
@@
test_expect_success 'clone shallow object count' '
test_expect_success 'pull in shallow repo with missing merge base' '
(
cd shallow &&
- git fetch --depth 4 .. A
+ git fetch --depth 4 .. A
&&
test_must_fail git merge --allow-unrelated-histories FETCH_HEAD
)
'