path: root/revision.c
diff options
authorShawn O. Pearce <>2007-10-16 02:31:47 (GMT)
committerShawn O. Pearce <>2007-10-16 02:31:47 (GMT)
commitd55e7c3acf72413563e695a19f7f66efac442064 (patch)
treeb12d163ceb3e56e36a90c82b9c075a3401cd00d3 /revision.c
parent03618b9df84a0e94e36fdb27060e605e85b956e9 (diff)
parent8492f00b4f28471af84d3887096257822c4d2bc9 (diff)
Merge branch 'maint'
* maint: Whip post maintenance series into shape. rebase -i: use diff plumbing instead of porcelain Do not remove distributed configure script git-archive: document --exec git-reflog: document --verbose git-config: handle --file option with relative pathname properly clear_commit_marks(): avoid deep recursion git add -i: Remove unused variables git add -i: Fix parsing of abbreviated hunk headers git-config: don't silently ignore options after --list Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT Fix embarrassing "git log --follow" bug Conflicts: RelNotes
Diffstat (limited to 'revision.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.c b/revision.c
index 5d294be..e76da0d 100644
--- 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)