projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-log: make sure we have some commit to start from.
[git.git]
/
git-fetch-script
diff --git
a/git-fetch-script
b/git-fetch-script
index
fce43e6
..
34ddfc8
100755
(executable)
--- a/
git-fetch-script
+++ b/
git-fetch-script
@@
-9,10
+9,13
@@
merge_store="$_remote_store"
TMP_HEAD="$GIT_DIR/TMP_HEAD"
case "$merge_repo" in
TMP_HEAD="$GIT_DIR/TMP_HEAD"
case "$merge_repo" in
-http://*)
- head=$(wget -q -O - "$merge_repo/$merge_head") || exit 1
+http://* | https://*)
+ if [ -n "$GIT_SSL_NO_VERIFY" ]; then
+ curl_extra_args="-k"
+ fi
+ head=$(curl -ns $curl_extra_args "$merge_repo/$merge_head") || exit 1
echo Fetching "$merge_head" using http
echo Fetching "$merge_head" using http
- git-http-pull -v -a "$
merge_
head" "$merge_repo/"
+ git-http-pull -v -a "$head" "$merge_repo/"
;;
rsync://*)
rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1
;;
rsync://*)
rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1
@@
-29,6
+32,8
@@
git-rev-parse --verify "$head" > /dev/null || exit 1
case "$merge_store" in
'')
case "$merge_store" in
'')
+ ;;
+*)
echo "$head" > "$GIT_DIR/$merge_store"
esac &&
echo "$head" > "$GIT_DIR/$merge_store"
esac &&