Start 1.6.0.2 maintenance cycle

[git.git] / builtin-blame.c

diff --git a/builtin-blame.c b/builtin-blame.c
index 8b6b09b10b8f9dcda0b7224f31c860bb803945f0..d2fc68c68a02d87c1f61442f8bbbc66c07b5b8d0 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1791,7 +1791,7 @@ static int prepare_lines(struct scoreboard *sb)
 
 /*
  * Add phony grafts for use with -S; this is primarily to
- * support git-cvsserver that wants to give a linear history
+ * support git's cvsserver that wants to give a linear history
  * to its clients.
  */
 static int read_ancestry(const char *graft_file)
@@ -2346,6 +2346,10 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 parse_done:
        argc = parse_options_end(&ctx);
 
+       if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
+               opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |
+                       PICKAXE_BLAME_COPY_HARDER);
+
        if (!blame_move_score)
                blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
        if (!blame_copy_score)