diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:34:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:35:14 -0700 |
| commit | eed94a570e0421175d6b4342c0ac48e03ceedf0b (patch) | |
| tree | f33864f2abffdcb83cbf626b26da34f9cc8d5bab /diffcore-rename.c | |
| parent | 4147d801db66df9b127ffe315601f467aa9d1c48 (diff) | |
| parent | 01aaf1f88ddc2b99162c302710339f202996f39b (diff) | |
| download | git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz | |
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 1de8d32502..0ec488a903 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -205,6 +205,7 @@ static void record_rename_pair(int dst_index, int src_index, int score) fill_filespec(two, dst->sha1, dst->mode); dp = diff_queue(NULL, one, two); + dp->renamed_pair = 1; if (!strcmp(src->path, dst->path)) dp->score = rename_src[src_index].score; else |