| commit | 57065289a9ef2fc962ec7f82f9771b45eba8dba1 | |
| author | René Scharfe <l.s.r@web.de> | |
| Sat, 30 Aug 2014 21:40:34 +0000 (30 23:40 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Sep 2014 18:02:58 +0000 (2 11:02 -0700) | ||
| tree | 51512efe584694dc62f656d79207ded0890d7793 | treesnapshot (tar.gz zip) |
| parent | 96db324a73fdada6fbe7b63221986f8f18cc63b0 | commitdiff |
merge-tree: remove unused df_conflict arguments
merge_trees_recursive() stores a pointer to its parameter df_conflict in
its struct traverse_info, but it is never actually used. Stop doing
that, remove the parameter and inline the function into merge_trees(),
as the latter is now only passing on its parameters.
Remove the parameter df_conflict from unresolved_directory() as well,
now that there is no way to pass it to merge_trees_recursive() through
that function anymore.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge_trees_recursive() stores a pointer to its parameter df_conflict in
its struct traverse_info, but it is never actually used. Stop doing
that, remove the parameter and inline the function into merge_trees(),
as the latter is now only passing on its parameters.
Remove the parameter df_conflict from unresolved_directory() as well,
now that there is no way to pass it to merge_trees_recursive() through
that function anymore.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge-tree.c | diffblobblamehistory |