Merge branch 'jk/checkout-from-tree'
commitc21df07886bb07a893609ff242e29b1493da1fd8
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2014 19:41:33 +0000 (5 11:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2014 19:41:33 +0000 (5 11:41 -0800)
tree7f76a3cc617ee737aac3dbd1e0fc7ad3c3347b68
parent09d60d785c68c8fa65094ecbe46fbc2a38d0fc1f
parentc5326bd62b7e168ba1339dacb7ee812d0fe98c7c
Merge branch 'jk/checkout-from-tree'

"git checkout $treeish $path", when $path in the index and the
working tree already matched what is in $treeish at the $path,
still overwrote the $path unnecessarily.

* jk/checkout-from-tree:
  checkout $tree: do not throw away unchanged index entries
builtin/checkout.c