Merge branch 'rs/checkout-am-fix-unborn' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:03:12 +0000 (09:03 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:03:12 +0000 (09:03 +0900)
commita207ad7081e42a64f826bd4d5193cecb67c84024
treea627c90f3a0f8d32d026a478cbee765648f6d5ae
parentc8c33216333c4b2ba86f51d9fa77f7c4daba8d30
parent57e0ef0e0e90c4cb72c35db874fc3d035b88ce4d
Merge branch 'rs/checkout-am-fix-unborn' into maint

A few codepaths in "checkout" and "am" working on an unborn branch
tried to access an uninitialized piece of memory.

* rs/checkout-am-fix-unborn:
  am: check return value of resolve_refdup before using hash
  checkout: check return value of resolve_refdup before using hash
builtin/am.c
builtin/checkout.c