Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 5 Jan 2007 06:28:21 +0000 (22:28 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 5 Jan 2007 06:28:21 +0000 (22:28 -0800)
* maint:
  pack-check.c::verify_packfile(): don't run SHA-1 update on huge data
  Fix infinite loop when deleting multiple packed refs.

1  2 
cache.h
lockfile.c
refs.c

diff --cc cache.h
Simple merge
diff --cc lockfile.c
Simple merge
diff --cc refs.c
Simple merge