diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-14 22:23:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-14 22:23:19 (GMT) |
| commit | 529635738683b4570b1cee894fa53bce66254e8b (patch) | |
| tree | 53ff578fbd633327c7e757fa300f573c173553c8 /t/perf | |
| parent | 228b78752de9d759839665764391262c0ec156cf (diff) | |
| parent | 32da7467ebc099e6032590773827884b704980cf (diff) | |
| download | git-529635738683b4570b1cee894fa53bce66254e8b.zip git-529635738683b4570b1cee894fa53bce66254e8b.tar.gz git-529635738683b4570b1cee894fa53bce66254e8b.tar.bz2 | |
Merge branch 'dp/filter-branch-prune-empty'
"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
Diffstat (limited to 't/perf')
| -rwxr-xr-x | t/perf/p7000-filter-branch.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/perf/p7000-filter-branch.sh b/t/perf/p7000-filter-branch.sh index 15ee5d1..b029586 100755 --- a/t/perf/p7000-filter-branch.sh +++ b/t/perf/p7000-filter-branch.sh @@ -16,4 +16,9 @@ test_perf 'noop filter' ' git filter-branch -f base..HEAD ' +test_perf 'noop prune-empty' ' + git checkout --detach tip && + git filter-branch -f --prune-empty base..HEAD +' + test_done |