@matheusbsbs / matheus-bagliano / commits / 99516e35d0
Fork 0

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 <filename>" didn't work, adding a "-p" magically made it work again even without this fix. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Linus Torvalds committed Oct 8, 2007 at 13:42 UTC 99516e35d096f41e7133cacde8fbed8ee9a3ecd0
1 file changed +2 -2
revision.c
+2 -2
@@ -1256,8 +1256,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
1256 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1257 revs->diff = 1;
1258
1259 - /* Pickaxe needs diffs */
1260 - if (revs->diffopt.pickaxe)
1259 + /* Pickaxe and rename following needs diffs */
1260 + if (revs->diffopt.pickaxe || revs->diffopt.follow_renames)
1261 revs->diff = 1;
1262
1263 if (revs->topo_order)