[PATCH] merge-recursive: fix subtree merge
- From
Miklos Vajna <vmiklos@frugalware.org>
- Date
- Aug 30, 2008, 15:42 UTC
- Message-ID
- <1220110929-6803-1-git-send-email-vmiklos@frugalware.org>
- In-Reply-To
- <1219674357-31000-1-git-send-email-vmiklos@frugalware.org>
We should decide if we do a subtree merge based on the merge_options struct, not based on the global variable, which should not even exist at all.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> ---
On Mon, Aug 25, 2008 at 04:25:57PM +0200, Miklos Vajna <vmiklos@frugalware.org> wrote:
> It also takes care of subtree merge, output buffering, verbosity, and > rename limits - these were global variables till now in > merge-recursive.c.
Actually subtree_merge was not used from the struct merge_options, here is the fix.
merge-recursive.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index 3a38cc6..457ad84 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -20,8 +20,6 @@ #include "attr.h" #include "merge-recursive.h" -static int subtree_merge; - static struct tree *shift_tree_object(struct tree *one, struct tree *two) { unsigned char shifted[20]; @@ -1152,7 +1150,7 @@ int merge_trees(struct merge_options *o, { int code, clean; - if (subtree_merge) { + if (o->subtree_merge) { merge = shift_tree_object(head, merge); common = shift_tree_object(head, common); }
-- 1.6.0