global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/c-merge-recursive' into next

Browse Source 
* js/c-merge-recursive:
  merge-recursive: fix rename handling
This commit is contained in:
Junio C Hamano
2006-08-04 19:15:24 -07:00
parent e518e9c7df 3d234d0afa
commit 6f73d9e424
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.c
View File

@@ -810,8 +810,10 @@ static int process_renames(struct path_list *a_renames,
} else {
compare = strcmp(a_renames->items[i].path,
b_renames->items[j].path);
ren1 = a_renames->items[i++].util;
ren2 = b_renames->items[j++].util;
if (compare <= 0)
ren1 = a_renames->items[i++].util;
if (compare >= 0)
ren2 = b_renames->items[j++].util;
}
/* TODO: refactor, so that 1/2 are not needed */