Merge branch 'dp/filter-branch-prune-empty' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 20:52:22 +0000 (13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 20:52:22 +0000 (13:52 -0700)
commitbfee58c0a59b2d84431b41052b774f5037cebe21
tree7867ba27caa9739514956f4b8d3cc502984a7c3c
parent2b69d3116ffb4a800c408b8cb0b508ca1886ea84
parent32da7467ebc099e6032590773827884b704980cf
Merge branch 'dp/filter-branch-prune-empty' into maint

"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