projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-mv: keep git index consistent with file system on failed rename
[git.git]
/
git-fetch.sh
diff --git
a/git-fetch.sh
b/git-fetch.sh
index
d398866
..
14ea295
100755
(executable)
--- a/
git-fetch.sh
+++ b/
git-fetch.sh
@@
-1,13
+1,18
@@
#!/bin/sh
#
#!/bin/sh
#
-. git-sh-setup
|| die "Not a git archive"
+. git-sh-setup
. git-parse-remote
_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"
. git-parse-remote
_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"
+LF='
+'
+IFS="$LF"
+
tags=
append=
force=
tags=
append=
force=
+verbose=
update_head_ok=
while case "$#" in 0) break ;; esac
do
update_head_ok=
while case "$#" in 0) break ;; esac
do
@@
-26,6
+31,9
@@
do
--update-head-o|--update-head-ok)
update_head_ok=t
;;
--update-head-o|--update-head-ok)
update_head_ok=t
;;
+ -v|--verbose)
+ verbose=Yes
+ ;;
*)
break
;;
*)
break
;;
@@
-87,12
+95,12
@@
append_fetch_head () {
then
headc_=$(git-rev-parse --verify "$head_^0") || exit
echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD"
then
headc_=$(git-rev-parse --verify "$head_^0") || exit
echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD"
- echo >&2 "* committish: $head_"
- echo >&2 " $note_"
+
[ "$verbose" ] &&
echo >&2 "* committish: $head_"
+
[ "$verbose" ] &&
echo >&2 " $note_"
else
echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD"
else
echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD"
- echo >&2 "* non-commit: $head_"
- echo >&2 " $note_"
+
[ "$verbose" ] &&
echo >&2 "* non-commit: $head_"
+
[ "$verbose" ] &&
echo >&2 " $note_"
fi
if test "$local_name_" != ""
then
fi
if test "$local_name_" != ""
then
@@
-110,7
+118,12
@@
fast_forward_local () {
# is no way to guarantee "fast-forward" anyway.
if test -f "$GIT_DIR/$1"
then
# is no way to guarantee "fast-forward" anyway.
if test -f "$GIT_DIR/$1"
then
- echo >&2 "* $1: updating with $3"
+ if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
+ then
+ [ "$verbose" ] && echo >&2 "* $1: same as $3"
+ else
+ echo >&2 "* $1: updating with $3"
+ fi
else
echo >&2 "* $1: storing $3"
fi
else
echo >&2 "* $1: storing $3"
fi
@@
-170,11
+183,15
@@
esac
reflist=$(get_remote_refs_for_fetch "$@")
if test "$tags"
then
reflist=$(get_remote_refs_for_fetch "$@")
if test "$tags"
then
- taglist=$(git-ls-remote --tags "$remote" | awk '{ print "."$2":"$2 }')
+ taglist=$(git-ls-remote --tags "$remote" |
+ sed -e '
+ /\^/d
+ s/^[^ ]* //
+ s/.*/&:&/')
if test "$#" -gt 1
then
# remote URL plus explicit refspecs; we need to merge them.
if test "$#" -gt 1
then
# remote URL plus explicit refspecs; we need to merge them.
- reflist="$reflist
$taglist"
+ reflist="$reflist
$LF
$taglist"
else
# No explicit refspecs; fetch tags only.
reflist=$taglist
else
# No explicit refspecs; fetch tags only.
reflist=$taglist
@@
-183,7
+200,7
@@
fi
for ref in $reflist
do
for ref in $reflist
do
- refs="$refs
$ref"
+ refs="$refs
$LF
$ref"
# These are relative path from $GIT_DIR, typically starting at refs/
# but may be HEAD
# These are relative path from $GIT_DIR, typically starting at refs/
# but may be HEAD
@@
-204,7
+221,7
@@
do
remote_name=$(expr "$ref" : '\([^:]*\):')
local_name=$(expr "$ref" : '[^:]*:\(.*\)')
remote_name=$(expr "$ref" : '\([^:]*\):')
local_name=$(expr "$ref" : '[^:]*:\(.*\)')
- rref="$rref
$remote_name"
+ rref="$rref
$LF
$remote_name"
# There are transports that can fetch only one head at a time...
case "$remote" in
# There are transports that can fetch only one head at a time...
case "$remote" in
@@
-212,7
+229,12
@@
do
if [ -n "$GIT_SSL_NO_VERIFY" ]; then
curl_extra_args="-k"
fi
if [ -n "$GIT_SSL_NO_VERIFY" ]; then
curl_extra_args="-k"
fi
- head=$(curl -nsf $curl_extra_args "$remote/$remote_name") &&
+ remote_name_quoted=$(perl -e '
+ my $u = $ARGV[0];
+ $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
+ print "$u";
+ ' "$remote_name")
+ head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") &&
expr "$head" : "$_x40\$" >/dev/null ||
die "Failed to fetch $remote_name from $remote"
echo >&2 Fetching "$remote_name from $remote" using http
expr "$head" : "$_x40\$" >/dev/null ||
die "Failed to fetch $remote_name from $remote"
echo >&2 Fetching "$remote_name from $remote" using http
@@
-262,6
+284,7
@@
case "$remote" in
http://* | https://* | rsync://* )
;; # we are already done.
*)
http://* | https://* | rsync://* )
;; # we are already done.
*)
+ IFS=" $LF"
(
git-fetch-pack "$remote" $rref || echo failed "$remote"
) |
(
git-fetch-pack "$remote" $rref || echo failed "$remote"
) |