From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Fri, 8 Jun 2007 21:28:50 +0000 (+0200)
Subject: filter-branch: subdirectory filter needs --full-history
X-Git-Tag: v1.5.3-rc0~69^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cfabd6eee1745cfec58cfcb794ce8847e43b888a?ds=inline;hp=cfabd6eee1745cfec58cfcb794ce8847e43b888a

filter-branch: subdirectory filter needs --full-history

When two branches are merged that modify a subdirectory (possibly in
different intermediate steps) such that both end up identical, then
rev-list chooses only one branch. But when we filter history, we want to
keep both branches. Therefore, we must use --full-history.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---