diff options
author | Linus Torvalds <torvalds@osdl.org> | 2006-04-01 16:35:06 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-04-01 18:16:53 -0800 |
commit | be7db6e574b95c70ac544c78d74fdeea0fb4058d (patch) | |
tree | 51dc8b10ec5506709fa80480a3f24279400a7984 /git-merge-ours.sh | |
parent | 2a0925be3512451834ec9a3e023f4cff23c1cfb7 (diff) | |
download | git-be7db6e574b95c70ac544c78d74fdeea0fb4058d.tar.gz |
revision: Fix --topo-order and --max-age with reachability limiting.
What ends up not working very well at all is the combination of
"--topo-order" and the output filter in get_revision. It will
return NULL when we see the first commit out of date-order, even
if we have other commits coming.
So we really should do the "past the date order" thing in
get_revision() only if we have _not_ done it already in
limit_list().
Something like this.
The easiest way to test this is with just
gitk --since=3.days.ago
on the kernel tree. Without this patch, it tends to be pretty obviously
broken.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions