Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile
commit2156a98045f83dd88386b2d4d3241d66bf722ade
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2014 20:13:20 +0000 (3 12:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2014 20:13:20 +0000 (3 12:13 -0800)
tree444a56f73ad574ca395ca3451dd947d57ff58943
parent2de34784dfcbb4fe0febe9ab98e0b99138040109
parent0eea5a6e91d3da6932c13f16fdf4b4e5ed91b93c
Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile

* sh/write-pack-file-warning-message-fix:
  write_pack_file: use correct variable in diagnostic
builtin/pack-objects.c