Merge branch 'mh/packed-ref-store-prep'
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Jun 2017 21:09:29 +0000 (14:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Jun 2017 21:09:29 +0000 (14:09 -0700)
Bugfix for a topic that is (only) in 'master'.

* mh/packed-ref-store-prep:
for_each_bisect_ref(): don't trim refnames
lock_packed_refs(): fix cache validity check

1  2 
refs.c
refs/files-backend.c
revision.c
diff --cc refs.c
Simple merge
Simple merge
diff --cc revision.c
Simple merge