Re: [PATCH 2/3] merge-recursive: remove return value from get_files_dirs
- From
Jeff King <peff@peff.net>
- Date
- Aug 29, 2017, 08:17 UTC
- Message-ID
- <20170829081752.nq5r776rjyf2amzh@sigill.intra.peff.net>
- In-Reply-To
- <20170828202829.3056-3-kewillf@microsoft.com>
On Mon, Aug 28, 2017 at 02:28:28PM -0600, Kevin Willford wrote:
Show 6 quoted lines
> 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.
Or that the function is buggy. :)
I'm tempted to say that we should probably die() when read_tree_recursive fails. This should only happen if we fail to parse the tree, or if our callback (save_files_dirs here) returns failure, and the latter looks like it never happens.
> Since the debug output has been removed and the caller isn't > checking the return value there is no reason to keep calulating > and returning a value.
Agreed, and I'm happy to see dead code go.
Minor nit: s/calulating/calculating/ in your commit message.
-Peff