Merge branch 'cb/maint-update-ref-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Nov 2008 01:32:49 +0000 (17:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Nov 2008 01:32:49 +0000 (17:32 -0800)
* cb/maint-update-ref-fix:
  push: fix local refs update if already up-to-date
  do not force write of packed refs

1  2 
builtin-send-pack.c
refs.c

Simple merge
diff --cc refs.c
Simple merge