diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-01 07:42:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-01 07:42:40 (GMT) |
| commit | fbc72799a82bb9a25657a6e30bfcd7b8fe3e5a45 (patch) | |
| tree | 3c142925662ed7d4f0a5e56b16c6d0654bcc01b7 | |
| parent | 12f9b8a3152ff9fa48464187a83f7c6279fe5094 (diff) | |
| download | git-fbc72799a82bb9a25657a6e30bfcd7b8fe3e5a45.zip git-fbc72799a82bb9a25657a6e30bfcd7b8fe3e5a45.tar.gz git-fbc72799a82bb9a25657a6e30bfcd7b8fe3e5a45.tar.bz2 | |
git-fetch: adjust to packed-refs.
The command checked the presence of a ref by directly looking
into $GIT_DIR/refs directory. Update it to use show-ref.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-fetch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 85e96a1..216be0c 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -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_" ||: |