Merge branch 'maint'

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index 5d294be308eed42c244c4424618b43d11048d4e6..e76da0d448f81d8b6b496990bc2568fef3662671 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1241,8 +1241,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)