Merge branch 'js/rerere-forget-protect-against-NUL' into maint
commit63a4d8d7236e03c8a8f30c2da83a84a8fe8dfe66
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:56 +0000 (22 11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:56 +0000 (22 11:26 -0700)
treea2f3400ce412aef23e0c53f2e2f415f94d55e2f1
parent21247455f328fcf26fc4f78134bcc6f8a676fa8a
parentb9e31f59478eeae3e4230308f6fc06713c6fc547
Merge branch 'js/rerere-forget-protect-against-NUL' into maint

* js/rerere-forget-protect-against-NUL:
  rerere forget: do not segfault if not all stages are present
  rerere forget: grok files containing NUL