From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: git@vger.kernel.org, Stephan Beyer <s-beyer@gmx.net>
Subject: Re: [PATCH] merge-recursive: fix subtree merge
Date: Sat, 30 Aug 2008 09:39:37 -0700 [thread overview]
Message-ID: <7vbpza1mpi.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1220110929-6803-1-git-send-email-vmiklos@frugalware.org> (Miklos Vajna's message of "Sat, 30 Aug 2008 17:42:09 +0200")
Miklos Vajna <vmiklos@frugalware.org> writes:
> 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.
As bd1e8fe (merge-recursive: introduce merge_options, 2008-08-25) is not
part of any solid integration branch yet, I'll squash this into it.
In the longer term, I suspect that other file scope static variables in
merge-recursive.c, such as call_depth, may want to move to merge_options,
not as "option" but as "current state". But that is quite minor, as it
only affects reentrancy, and I do not see a reason for merge_recursive()
to be reentrant (yet).
next prev parent reply other threads:[~2008-08-30 16:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-19 9:05 What's cooking in git.git (Aug 2008, #05; Tue, 19) Junio C Hamano
2008-08-19 11:02 ` Johannes Sixt
2008-08-19 12:35 ` Andreas Färber
2008-08-19 12:54 ` Miklos Vajna
2008-08-19 19:19 ` Junio C Hamano
2008-08-19 20:59 ` Miklos Vajna
2008-08-19 22:00 ` Junio C Hamano
2008-08-20 22:42 ` Miklos Vajna
2008-08-25 1:44 ` [PATCH] merge-recursive: introduce merge_options Miklos Vajna
2008-08-25 6:06 ` Junio C Hamano
2008-08-25 14:25 ` Miklos Vajna
2008-08-28 4:50 ` Junio C Hamano
2008-08-30 15:42 ` [PATCH] merge-recursive: fix subtree merge Miklos Vajna
2008-08-30 16:39 ` Junio C Hamano [this message]
2008-08-30 17:55 ` Junio C Hamano
2008-08-31 23:49 ` Miklos Vajna
2008-09-01 1:06 ` What's cooking in git.git (Aug 2008, #05; Tue, 19) Miklos Vajna
2008-09-01 1:09 ` [PATCH] builtin-revert: use merge_recursive_generic() Miklos Vajna
2008-09-02 20:02 ` What's cooking in git.git (Aug 2008, #05; Tue, 19) Junio C Hamano
2008-09-02 20:43 ` Junio C Hamano
2008-09-02 22:05 ` [PATCH 0/2] Move call_depth and index_only to struct merge_options Miklos Vajna
2008-09-02 22:05 ` [PATCH 1/2] merge-recursive: move call_depth " Miklos Vajna
2008-09-02 22:05 ` [PATCH 2/2] merge-recursive: move index_only " Miklos Vajna
2008-09-02 22:13 ` [PATCH] Makefile: add merge_recursive.h to LIB_H Miklos Vajna
2008-09-02 22:39 ` Junio C Hamano
2008-09-02 23:49 ` Miklos Vajna
2008-09-02 22:39 ` [PATCH 0/2] Move call_depth and index_only to struct merge_options Junio C Hamano
2008-09-03 0:16 ` [PATCH] merge-recursive: get rid of the index_only global variable Miklos Vajna
2008-09-03 0:39 ` [PATCH] merge-recursive: move the global obuf to struct merge_options Miklos Vajna
2008-09-03 17:34 ` Miklos Vajna
2008-09-03 17:34 ` [PATCH 1/2] merge-recursive: move current_{file,directory}_set " Miklos Vajna
2008-09-03 17:34 ` [PATCH 2/2] merge-recursive: move make_virtual_commit()'s virtual_id to merge_options Miklos Vajna
2008-09-04 19:03 ` Junio C Hamano
2008-09-05 17:26 ` [PATCH] merge-recursive: get rid of virtual_id Miklos Vajna
2008-09-04 19:05 ` [PATCH] merge-recursive: move the global obuf to struct merge_options Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vbpza1mpi.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
--cc=vmiklos@frugalware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).