From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Mar 2017 20:52:22 +0000 (-0700)
Subject: Merge branch 'dp/filter-branch-prune-empty' into maint
X-Git-Tag: v2.12.3~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfee58c0a59b2d84431b41052b774f5037cebe21;p=thirdparty%2Fgit.git

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
---

bfee58c0a59b2d84431b41052b774f5037cebe21