Merge branch 'jc/refs-and-fetch'

* jc/refs-and-fetch:
  git-fetch: adjust to packed-refs.
This commit is contained in:
Junio C Hamano 2006-11-01 08:49:19 -08:00
Родитель 58a1e0e83b fbc72799a8
Коммит e0d68cd5d9
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -147,15 +147,15 @@ update_local_ref () {
[ "$verbose" ] && echo >&2 " $label_: $newshort_"
return 0
fi
oldshort_=$(git-rev-parse --short "$1" 2>/dev/null)
mkdir -p "$(dirname "$GIT_DIR/$1")"
oldshort_=$(git show-ref --hash --abbrev "$1" 2>/dev/null)
case "$1" in
refs/tags/*)
# Tags need not be pointing at commits so there
# is no way to guarantee "fast-forward" anyway.
if test -f "$GIT_DIR/$1"
if test -n "$oldshort_"
then
if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
if now_=$(git show-ref --hash "$1") && test "$now_" = "$2"
then
[ "$verbose" ] && echo >&2 "* $1: same as $3"
[ "$verbose" ] && echo >&2 " $label_: $newshort_" ||: