From: Brad King <brad.king@kitware.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Heiko Voigt <hvoigt@hvoigt.net>
Subject: Re: [PATCH 2/2] revision: do not include sibling history in --ancestry-path output
Date: Fri, 26 Aug 2011 08:51:36 -0400 [thread overview]
Message-ID: <4E5796D8.3060407@kitware.com> (raw)
In-Reply-To: <7v7h61gf5i.fsf_-_@alter.siamese.dyndns.org>
On 8/25/2011 9:00 PM, Junio C Hamano wrote:
> If the commit specified as the bottom of the commit range has a direct
> parent that has another child commit that contributed to the resulting
> history, "rev-list --ancestry-path" was confused and listed that side
> history as well.
>
> D---E
> / \
> ---X---A---B---C
>
> In this history, "rev-list --ancestry-path A..C" should list among what
> the corresponding command without --ancestry-path option would produce,
> namely, D, E, B and C, but limiting the result to those that are
> descendant of A (i.e. B and C). Due to the command line parser subtlety
> corrected by the previous commit, it also listed those that are descendant
> of X as well.
>
> Signed-off-by: Junio C Hamano<gitster@pobox.com>
> ---
> * And this should fix the breakage you demonstrated.
Yes it does, thanks. It also makes the submodule search during recursive
merge work as I expect after the fix I tried (only run the search if
o->call_depth == 0). I'll submit that patch separately when I find time.
Tested-by: Brad King <brad.king@kitware.com>
Thanks,
-Brad
next prev parent reply other threads:[~2011-08-26 12:52 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 [this message]
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
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=4E5796D8.3060407@kitware.com \
--to=brad.king@kitware.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 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.