author | Johan Herland <johan@herland.net> | |
Thu, 3 Jun 2010 23:17:37 +0000 (01:17 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 6 Jun 2010 17:16:37 +0000 (10:16 -0700) | ||
commit | cb7529e13bce186f8b883c9fbb08602cd3a0795f | |
tree | 882bf412298bf54f2256e0b6b148735159746f65 | tree | snapshot |
parent | 97b03c353856602a3c30b01baae1efb8dfe4243e | commit | diff |
revision: Turn off history simplification in --ancestry-path mode
When using --ancestry-path together with history simplification (typically
triggered by path limiting), history simplification would get in the way of
--ancestry-path by prematurely removing the parent links between commits on
which the ancestry path calculations are made.
This patch disables this history simplification when --ancestry-path is
enabled. This is similar to what e.g. --full-history already does.
The patch also includes a simple testcase verifying that --ancestry-path
works together with path limiting.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When using --ancestry-path together with history simplification (typically
triggered by path limiting), history simplification would get in the way of
--ancestry-path by prematurely removing the parent links between commits on
which the ancestry path calculations are made.
This patch disables this history simplification when --ancestry-path is
enabled. This is similar to what e.g. --full-history already does.
The patch also includes a simple testcase verifying that --ancestry-path
works together with path limiting.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
revision.c | diff | blob | history | |
t/t6019-rev-list-ancestry-path.sh | diff | blob | history |