summaryrefslogtreecommitdiff
path: root/git-fetch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-28 14:38:36 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-28 14:38:36 -0800
commit77b50ab009deab7f8eb703843a71ac7253b977c8 (patch)
treece1cd978189ff7f50efbf8e6d41895e89b6a6e11 /git-fetch.sh
parent1db8b60b2a6ef0cc0f7cc7d0783b7cda2ce894ca (diff)
parent64d99e9c5a4a3fb35d803894992764a6e288de5d (diff)
downloadgit-77b50ab009deab7f8eb703843a71ac7253b977c8.tar.gz
Merge branch 'js/bundle'
* js/bundle: bundle: reword missing prerequisite error message git-bundle: record commit summary in the prerequisite data git-bundle: fix 'create --all' git-bundle: avoid fork() in verify_bundle() git-bundle: assorted fixes Add git-bundle: move objects and references by archive
Diffstat (limited to 'git-fetch.sh')
-rwxr-xr-xgit-fetch.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-fetch.sh b/git-fetch.sh
index d230995f6e..59bee5db0f 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -386,8 +386,15 @@ fetch_main () {
( : subshell because we muck with IFS
IFS=" $LF"
(
+ if test -f "$remote" ; then
+ test -n "$shallow_depth" &&
+ die "shallow clone with bundle is not supported"
+ git-bundle unbundle "$remote" $rref ||
+ echo failed "$remote"
+ else
git-fetch-pack --thin $exec $keep $shallow_depth "$remote" $rref ||
echo failed "$remote"
+ fi
) |
(
trap '