undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/refs-and-fetch'

Browse Source 
* 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
commit e0d68cd5d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-fetch.sh
View File

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