diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-17 00:42:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-17 00:42:45 (GMT) |
| commit | 89efac81c716bb296098fd1c5482bac3ecb344c5 (patch) | |
| tree | d5a9e888d3858ba1b8f3b8dce037acf500f8a81d /diffcore-rename.c | |
| parent | 75ae10bc75336db031ee58d13c5037b929235912 (diff) | |
| parent | ef68c3d800b9c4516f1a13038e047610882cd26f (diff) | |
| download | git-89efac81c716bb296098fd1c5482bac3ecb344c5.zip git-89efac81c716bb296098fd1c5482bac3ecb344c5.tar.gz git-89efac81c716bb296098fd1c5482bac3ecb344c5.tar.bz2 | |
Merge branch 'en/ort-perf-batch-12'
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
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 3375e24..35378d8 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -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) |