Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > diff --git a/path-list.c b/path-list.c > index 0c332dc..f8800f8 100644 > --- a/path-list.c > +++ b/path-list.c > @@ -57,7 +57,7 @@ struct path_list_item *path_list_insert( > int index = add_entry(list, path); > > if (index < 0) > - index = 1 - index; > + index = -1 - index; > > return list->items + index; > } This part looks like a genuine bugfix and unrelated to shortlog. Many callers of path_list_insert() seem to ignore its return value, but merge_recursive.c seems to use it in three places, to find an entry to hang cached rename information to in insert_stage_data(). I haven't come up with an example to demonstrate the breakage of not having this fix in the existing git-merge-recursive, but I think this needs to be applied to even 'maint'. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html