Merge branch 'mm/diag-path-in-treeish'

* mm/diag-path-in-treeish:
  Detailed diagnosis when parsing an object name fails.

diff --cc setup.c
Simple merge