projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make index file locking code reusable to others.
[git.git]
/
git-fetch.sh
diff --git
a/git-fetch.sh
b/git-fetch.sh
index
280f62e
..
48818f8
100755
(executable)
--- a/
git-fetch.sh
+++ b/
git-fetch.sh
@@
-166,7
+166,10
@@
fast_forward_local () {
mb=$(git-merge-base "$local" "$2") &&
case "$2,$mb" in
$local,*)
mb=$(git-merge-base "$local" "$2") &&
case "$2,$mb" in
$local,*)
- echo >&2 "* $1: same as $3"
+ if test -n "$verbose"
+ then
+ echo >&2 "* $1: same as $3"
+ fi
;;
*,$local)
echo >&2 "* $1: fast forward to $3"
;;
*,$local)
echo >&2 "* $1: fast forward to $3"
@@
-211,12
+214,12
@@
esac
reflist=$(get_remote_refs_for_fetch "$@")
if test "$tags"
then
reflist=$(get_remote_refs_for_fetch "$@")
if test "$tags"
then
- taglist=
$(IFS="
" &&
+ taglist=
`IFS="
" &&
git-ls-remote $upload_pack --tags "$remote" |
while read sha1 name
do
case "$name" in
git-ls-remote $upload_pack --tags "$remote" |
while read sha1 name
do
case "$name" in
-
(
*^*) continue ;;
+ *^*) continue ;;
esac
if git-check-ref-format "$name"
then
esac
if git-check-ref-format "$name"
then
@@
-224,7
+227,7
@@
then
else
echo >&2 "warning: tag ${name} ignored"
fi
else
echo >&2 "warning: tag ${name} ignored"
fi
- done
)
+ done
`
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.