projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fetch-pack: start multi-head pulling.
[git.git]
/
git-fetch-script
diff --git
a/git-fetch-script
b/git-fetch-script
index
2040c12
..
ea09714
100755
(executable)
--- a/
git-fetch-script
+++ b/
git-fetch-script
@@
-15,27
+15,13
@@
http://* | https://*)
fi
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' &&
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" &&
fi
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' &&
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" &&
- head=$(curl -ns $curl_extra_args "$merge_repo/$merge_head") &&
+ head=$(curl -ns
f
$curl_extra_args "$merge_repo/$merge_head") &&
expr "$head" : "$_x40\$" >/dev/null || {
echo >&2 "Failed to fetch $merge_head from $merge_repo"
exit 1
}
expr "$head" : "$_x40\$" >/dev/null || {
echo >&2 "Failed to fetch $merge_head from $merge_repo"
exit 1
}
- git-fetch-dumb-http "$head" "$@"
- case "$?" in
- 0) ;;
- 2) no_dumb_http_support=1 ;;
- *) exit;;
- esac
echo Fetching "$merge_head" using http
echo Fetching "$merge_head" using http
- git-http-pull -v -a "$head" "$merge_repo/" || {
- case "$no_dumb_http_support" in
- 1)
- echo >&2 "* This could be because the $merge_repo is packed without"
- echo >&2 " preparing dumb server support files."
- ;;
- esac
- exit 1
- }
+ git-http-pull -v -a "$head" "$merge_repo/" || exit
;;
rsync://*)
rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1
;;
rsync://*)
rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1
@@
-45,6
+31,10
@@
rsync://*)
;;
*)
head=$(git-fetch-pack "$merge_repo" "$merge_head")
;;
*)
head=$(git-fetch-pack "$merge_repo" "$merge_head")
+ if h=`expr "$head" : '\([^ ][^ ]*\) '`
+ then
+ head=$h
+ fi
;;
esac || exit 1
;;
esac || exit 1