Merge branch 'mz/oneway-merge-wo-u-no-lstat'
commit2d0029e38f3ecd355b403ffa8a75416129439185
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2013 06:11:39 +0000 (6 22:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2013 06:11:39 +0000 (6 22:11 -0800)
tree4701427ef62e3c44ac37c142a0643fd71e9144cc
parent1fd365d5efab58453d9200d51ddf6ec700e03d8b
parent686b2de0ceb2c5a1fb6c8822a8aceb8a05e2fc76
Merge branch 'mz/oneway-merge-wo-u-no-lstat'

Optimize "read-tree -m <tree-ish>" without "-u".

* mz/oneway-merge-wo-u-no-lstat:
  oneway_merge(): only lstat() when told to update worktree