From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] unpack-trees: don't shift conflicts left and right
Date: Tue, 18 Jun 2013 21:33:25 +0200 [thread overview]
Message-ID: <51C0B605.10908@lsrfire.ath.cx> (raw)
In-Reply-To: <7vsj0g9udh.fsf@alter.siamese.dyndns.org>
Am 18.06.2013 01:42, schrieb Junio C Hamano:
> But the need to go all the way up in the recursive callframes to get
> the union of bitmask to get conflicts looks somewhat ugly.
Yes, that's not pretty. It's like make_traverse_path in that regard,
though, so it fits in somehow.
I suspect the *real* solution is to put something like
traverse_trees_recursive into tree-walk.c. Both callers of
traverse_tree recurse into subdirectories in slightly different ways.
Providing that functionality in a central place should reduce code
duplication.
René
prev parent reply other threads:[~2013-06-18 19:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-15 23:44 [PATCH] unpack-trees: don't shift conflicts left and right René Scharfe
2013-06-16 0:56 ` Junio C Hamano
2013-06-17 20:30 ` René Scharfe
2013-06-17 20:44 ` Junio C Hamano
2013-06-17 22:29 ` René Scharfe
2013-06-17 23:29 ` Junio C Hamano
2013-06-17 23:26 ` René Scharfe
2013-06-17 23:42 ` Junio C Hamano
2013-06-18 19:33 ` René Scharfe [this message]
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=51C0B605.10908@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.