averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'en/ort-perf-batch-12'

Browse Source 
More fix-ups and optimization to "merge -sort".

* en/ort-perf-batch-12:
  merge-ort: miscellaneous touch-ups
  Fix various issues found in comments
  diffcore-rename: avoid unnecessary strdup'ing in break_idx
  merge-ort: replace string_list_df_name_compare with faster alternative
This commit is contained in:
Junio C Hamano
2021-07-16 17:42:45 -07:00
parent 75ae10bc75 ef68c3d800
commit 89efac81c7
3 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diffcore-rename.c
View File

@@ -54,7 +54,7 @@ static void register_rename_src(struct diff_filepair *p)
if (p->broken_pair) {
if (!break_idx) {
break_idx = xmalloc(sizeof(*break_idx));
strintmap_init(break_idx, -1);
strintmap_init_with_options(break_idx, -1, NULL, 0);
}
strintmap_set(break_idx, p->one->path, rename_dst_nr);
}
@@ -1543,7 +1543,7 @@ void diffcore_rename_extended(struct diff_options *options,
/* all the usual ones need to be kept */
diff_q(&outq, p);
else
/* no need to keep unmodified pairs; FIXME: remove earlier? */
/* no need to keep unmodified pairs */
pair_to_free = p;
if (pair_to_free)