"Avery Pennarun" <apenwarr@xxxxxxxxx> writes:
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 257bf8f..79b45ed 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -21,7 +21,8 @@
> #include "merge-recursive.h"
> #include "dir.h"
>
> -static struct tree *shift_tree_object(struct tree *one, struct tree *two)
> +static struct tree *shift_tree_object(struct tree *one, struct tree *two,
> + const char *subtree_shift)
> {
> unsigned char shifted[20];
>
> @@ -29,7 +30,12 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two)
> * NEEDSWORK: this limits the recursion depth to hardcoded
> * value '2' to avoid excessive overhead.
> */
> - shift_tree(one->object.sha1, two->object.sha1, shifted, 2);
The block comment with NEEDSWORK should be removed from here. I may have
forgotten to in the original one, but that is not an excuse to replicate a
bad job ;-)
--
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