From: Brad King <brad.king@kitware•com>
To: git@vger•kernel.org
Cc: Junio C Hamano <gitster@pobox•com>, Heiko Voigt <hvoigt@hvoigt•net>
Subject: [PATCH 0/2] Do not search submodules in deep recursive merge
Date: Thu, 13 Oct 2011 08:59:03 -0400 [thread overview]
Message-ID: <cover.1318509069.git.brad.king@kitware.com> (raw)
In-Reply-To: <7vipnu9hbj.fsf@alter.siamese.dyndns.org>
On 10/12/2011 2:48 PM, Junio C Hamano wrote:
> [Stalled]
>
> * hv/submodule-merge-search (2011-08-26) 5 commits
> - submodule: Search for merges only at end of recursive merge
> - allow multiple calls to submodule merge search for the same path
> - submodule: Demonstrate known breakage during recursive merge
> - push: Don't push a repository with unpushed submodules
> - push: teach --recurse-submodules the on-demand option
> (this branch is tangled with fg/submodule-auto-push.)
AFAICT these two topics are tangled due revision traversal interactions.
I've untangled the two "submodule:" commits from this stalled topic and
rebased on master (34c4461a) resolving one conflict.
The first commit demonstrates a bug: submodule merge search occurs
multiple times for the same path during a recursive merge and fails the
second time. The second commit fixes it by performing the merge search
only at depth 0 recursion. These changes are independent from the
actual merge search and revision traversal logic.
Brad
Brad King (2):
submodule: Demonstrate known breakage during recursive merge
submodule: Search for merges only at end of recursive merge
merge-recursive.c | 6 +++-
submodule.c | 6 ++++-
submodule.h | 2 +-
t/t7405-submodule-merge.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 61 insertions(+), 4 deletions(-)
--
1.7.5.4
next prev parent reply other threads:[~2011-10-13 13:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-12 18:48 What's cooking in git.git (Oct 2011, #04; Wed, 12) Junio C Hamano
2011-10-12 19:02 ` Jeff King
2011-10-12 19:05 ` Junio C Hamano
2011-10-13 6:02 ` Jakub Narebski
2011-10-13 12:59 ` Brad King [this message]
2011-10-13 12:59 ` [PATCH 1/2] submodule: Demonstrate known breakage during recursive merge Brad King
2011-10-13 12:59 ` [PATCH 2/2] submodule: Search for merges only at end of " Brad King
2011-10-13 18:15 ` [PATCH 0/2] Do not search submodules in deep " 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=cover.1318509069.git.brad.king@kitware.com \
--to=brad.king@kitware$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=hvoigt@hvoigt$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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