From: Linus Torvalds Date: Mon, 8 Oct 2007 20:42:41 +0000 (-0700) Subject: Fix embarrassing "git log --follow" bug X-Git-Tag: v1.5.3.5~56 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=99516e35d096f41e7133cacde8fbed8ee9a3ecd0;p=git.git Fix embarrassing "git log --follow" bug It turns out that I completely broke "git log --follow" with my recent patch to revision.c ("Fix revision log diff setup, avoid unnecessary diff generation", commit b7bb760d5ed4881422673d32f869d140221d3564). Why? Because --follow obviously requires the diff machinery to function, exactly the same way pickaxe does. So everybody is away right now, but considering that nobody even noticed this bug, I don't think it matters. But for the record, here's the trivial one-liner fix (well, two, since I also fixed the comment). Because of the nature of the bug, if you ask for patches when following (which is one of the things I normally do), the bug is hidden, because then the request for diff output will automatically also enable the diffs themselves. So while "git log --follow " didn't work, adding a "-p" magically made it work again even without this fix. Signed-off-by: Linus Torvalds Signed-off-by: Lars Hjemli Signed-off-by: Shawn O. Pearce --- diff --git a/revision.c b/revision.c index 658471385..48756b5d4 100644 --- a/revision.c +++ b/revision.c @@ -1256,8 +1256,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) revs->diff = 1; - /* Pickaxe needs diffs */ - if (revs->diffopt.pickaxe) + /* Pickaxe and rename following needs diffs */ + if (revs->diffopt.pickaxe || revs->diffopt.follow_renames) revs->diff = 1; if (revs->topo_order)