merge-recursive: remove return value from get_files_dirs
The return value of the get_files_dirs call is never being used. Looking at the history of the file and it was originally only being used for debug output statements. Also when read_tree_recursive return value is non zero it is changed to zero. This leads me to believe that it doesn't matter if read_tree_recursive gets an error. Since the debug output has been removed and the caller isn't checking the return value there is no reason to keep calculating and returning a value. Signed-off-by: Kevin Willford <kewillf@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kevin Willford committed
Aug 28, 2017 at 14:28 UTC
ef9c4dc3b6a4feeabd28e9576260e077c607159e
1 file changed
+2
-6
merge-recursive.c
+2
-6
@@ -328,15 +328,11 @@ static int save_files_dirs(const unsigned char *sha1,
328
return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
329
}
330
331
-static int get_files_dirs(struct merge_options *o, struct tree *tree)
331
+static void get_files_dirs(struct merge_options *o, struct tree *tree)
332
{
333
- int n;
333
struct pathspec match_all;
334
memset(&match_all, 0, sizeof(match_all));
336
- if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
337
- return 0;
338
- n = o->current_file_set.nr + o->current_directory_set.nr;
339
- return n;
335
+ read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
336
}
337
338
/*