Merge branch 'mh/blame-worktree' into maint
commit327b3f8459a316aa5c27a8784f0f504122fce60e
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:32 +0000 (8 14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:32 +0000 (8 14:21 -0700)
treef197b28a0e74964acad5cdaefdd225cf39c8b428
parent08df31eeccfe1576971ea4ba42570a424c3cfc41
parentc66b470082144471fc95e669eb398c8f320d67c4
Merge branch 'mh/blame-worktree' into maint

"git blame file" allowed the lineage of lines in the uncommitted,
unadded contents of "file" to be inspected, but it refused when
"file" did not appear in the current commit.  When "file" was
created by renaming an existing file (but the change has not been
committed), this restriction was unnecessarily tight.

* mh/blame-worktree:
  t/t8003-blame-corner-cases.sh: Use here documents
  blame: allow to blame paths freshly added to the index
builtin/blame.c