From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jun 2020, #05; Thu, 25)
Date: Fri, 26 Jun 2020 01:43:15 -0700 [thread overview]
Message-ID: <20200626084315.GB84491@Carlos-MBP> (raw)
In-Reply-To: <xmqq1rm2i8qg.fsf@gitster.c.googlers.com>
On Fri, Jun 26, 2020 at 12:31:19AM -0700, Junio C Hamano wrote:
> Carlo Marcelo Arenas Belón <carenas@gmail.com> writes:
>
> > On Thu, Jun 25, 2020 at 06:12:40PM -0700, Junio C Hamano wrote:
> >>
> >> * cb/is-descendant-of (2020-06-23) 1 commit
> >> (merged to 'next' on 2020-06-25 at ca0eaddf5e)
> >> + commit-reach: avoid is_descendant_of() shim
> >>
> >> Code clean-up.
> >>
> >> Will merge to 'master'.
> >
> > apologize for the most likely unnecessary clarification (probably implied
> > by the merged comment indicating ca0eaddf5e), but this branch uses both
> > rs/pull-leakfix and rs/commit-reach-leakfix, that are currently merged
> > earlier into next and also scheduled for master.
>
> Hmph, Does it break if it is merged alone to 'master' without these
> other two topics? I somehow thought I disentangled the topic from
> unnecessary dependencies before queuing it, but it is possible that
> I misremember...
Doesn't break and applies perfectly on its own, or in any order with
rs/pull-leakfix, but will conflict with rs/commit-reach-leakfix with
the obvious conflict resolution needed:
--- >8 ---
diff --cc commit-reach.c
index 1761217663,2d85265a35..f846d30f22
--- a/commit-reach.c
+++ b/commit-reach.c
@@@ -433,9 -427,8 +428,10 @@@ int ref_newer(const struct object_id *n
return 0;
commit_list_insert(old_commit, &old_commit_list);
- ret = is_descendant_of(new_commit, old_commit_list);
- return repo_is_descendant_of(the_repository,
++ ret = repo_is_descendant_of(the_repository,
+ new_commit, old_commit_list);
+ free_commit_list(old_commit_list);
+ return ret;
}
/*
next prev parent reply other threads:[~2020-06-26 8:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-26 1:12 What's cooking in git.git (Jun 2020, #05; Thu, 25) Junio C Hamano
2020-06-26 7:08 ` Carlo Marcelo Arenas Belón
2020-06-26 7:31 ` Junio C Hamano
2020-06-26 8:43 ` Carlo Marcelo Arenas Belón [this message]
2020-06-26 14:45 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200626084315.GB84491@Carlos-MBP \
--to=carenas@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).