]> git.neil.brown.name Git - git.git/commitdiff
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)
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

1  2 
builtin/am.c
builtin/checkout.c

diff --cc builtin/am.c
Simple merge
Simple merge