Merge branch 'dp/filter-branch-prune-empty' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Mar 2017 21:35:32 +0000 (13:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Mar 2017 21:35:32 +0000 (13:35 -0800)
commit9317e24cd3de642f37dbdfacfdf36cde563582db
treec6fb8fd0ef7d6a0c6e2ded4b9a5f78709aa22828
parentc8c4bb78a2447b3a0d8f30e5e0978d4050f75532
parent32da7467ebc099e6032590773827884b704980cf
Merge branch 'dp/filter-branch-prune-empty' into next

"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.

* dp/filter-branch-prune-empty:
  p7000: add test for filter-branch with --prune-empty
  filter-branch: fix --prune-empty on parentless commits
  t7003: ensure --prune-empty removes entire branch when applicable
  t7003: ensure --prune-empty can prune root commit