From: Junio C Hamano <gitster@pobox.com>
To: Brad King <brad.king@kitware.com>
Cc: git@vger.kernel.org, Heiko Voigt <hvoigt@hvoigt.net>
Subject: Re: [PATCH/RFC] submodule: Search for merges only at end of recursive merge
Date: Fri, 26 Aug 2011 12:04:32 -0700 [thread overview]
Message-ID: <7vr548c7un.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <03300e44101092641810b34086738a151e01d8ee.1314368109.git.brad.king@kitware.com> (Brad King's message of "Fri, 26 Aug 2011 10:18:28 -0400")
This is a knee-jerk reaction without thinking things thoroughly through,
but wouldn't it make more sense to do this by conditionally calling
merge_submodule() when !o->call_depth, leaving the callee oblivious to
what is in the "merge_options" structure? That way, you do not have to
touch submodule.c at all, I would think.
After all, merge_submodule() should be usable in a future merge strategy
that is different from recursive and has no notion of call_depth.
next prev parent reply other threads:[~2011-08-26 19:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-24 13:59 [PATCH] submodule: Demonstrate known breakage during recursive merge Brad King
2011-08-24 19:14 ` Heiko Voigt
2011-08-24 19:24 ` Junio C Hamano
2011-08-24 19:46 ` Heiko Voigt
2011-08-24 20:02 ` Brad King
2011-08-24 20:27 ` Heiko Voigt
2011-08-24 20:40 ` Brad King
2011-08-24 21:32 ` Heiko Voigt
2011-08-25 16:49 ` [PATCH] rev-list: Demonstrate breakage with --ancestry-path --all Brad King
2011-08-25 23:08 ` Junio C Hamano
2011-08-25 23:49 ` Junio C Hamano
2011-08-26 1:00 ` [PATCH 1/2] revision: keep track of the end-user input from the command line Junio C Hamano
2011-08-26 1:08 ` Sverre Rabbelier
2011-08-26 2:21 ` Junio C Hamano
2011-08-26 1:00 ` [PATCH 2/2] revision: do not include sibling history in --ancestry-path output Junio C Hamano
2011-08-26 12:51 ` Brad King
2011-08-24 22:43 ` [PATCH] submodule: Demonstrate known breakage during recursive merge Junio C Hamano
2011-08-25 21:11 ` [PATCH] allow multiple calls to submodule merge search for the same path Heiko Voigt
2011-08-25 23:22 ` Junio C Hamano
2011-08-25 23:28 ` Junio C Hamano
2011-08-25 23:39 ` Junio C Hamano
2011-08-25 12:28 ` [PATCH v2] submodule: Demonstrate known breakage during recursive merge Brad King
2011-08-26 14:18 ` [PATCH/RFC] submodule: Search for merges only at end of " Brad King
2011-08-26 19:04 ` Junio C Hamano [this message]
2011-08-26 19:30 ` [PATCH v2/RFC] " Brad King
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=7vr548c7un.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=brad.king@kitware.com \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
/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).