projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
setup_git_directory: make sure GIT_DIR is a valid repository.
[git.git]
/
git-fetch.sh
diff --git
a/git-fetch.sh
b/git-fetch.sh
index
8564cbf
..
14ea295
100755
(executable)
--- a/
git-fetch.sh
+++ b/
git-fetch.sh
@@
-1,6
+1,6
@@
#!/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"
@@
-12,6
+12,7
@@
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
@@
-30,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
;;
@@
-91,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
@@
-116,7
+120,7
@@
fast_forward_local () {
then
if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
then
then
if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
then
- echo >&2 "* $1: same as $3"
+
[ "$verbose" ] &&
echo >&2 "* $1: same as $3"
else
echo >&2 "* $1: updating with $3"
fi
else
echo >&2 "* $1: updating with $3"
fi