Merge branch 'jk/top-level-refs-cleanup' into jch
commit252e072e33117ded3a758af0985ac53b14685923
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:34:12 +0000 (25 12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:34:12 +0000 (25 12:34 -0700)
tree57890947bf5d9e6d464f15b5bab468a83317dfe4
parent2431f121ad2ee64784cfbd1e0426cf11bcbd83e3
parentc252785982c268e5c969900c677322744d09f52e
Merge branch 'jk/top-level-refs-cleanup' into jch

* jk/top-level-refs-cleanup:
  fast-import: fix buffer overflow in dump_tags
  fast-import: clean up pack_data pointer in end_packfile

Conflicts:
fast-import.c
fast-import.c