From: David Kastrup <dak@gnu.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)
Date: Wed, 02 Apr 2014 07:05:39 +0200 [thread overview]
Message-ID: <87ha6cian0.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <xmqqppl0yaf9.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 01 Apr 2014 15:03:38 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> I haven't reverted the merge of that "submodule update" topic yet; I
>> should do that soonish.
>> ...
>
> Sigh... This is giving me a lot of headache.
>
> As 23d25e48 (submodule: explicit local branch creation in
> module_clone, 2014-01-26) has been in 'master' since fairly early
> during this cycle, a lot of topics that are not planned to be on the
> 'maint' branch has forked from the tip of 'master' and are now
> contaminated by that commit.
>
> I think I have a preparatory patch to correctly revert 00d4ff1a
> (Merge branch 'wt/doc-submodule-name-path-confusion-2', 2014-03-31)
> and 06c27689 (Merge branch 'wk/submodule-on-branch', 2014-02-27),
> and also a part of 384364b (Start preparing for Git 2.0,
> 2014-03-07), but I am not sure what to do with them ;-<))
Why not just revert on master? When merging with the topic branches,
the revert should then override the contamination.
It makes some sense then to rewrite the "submodule update" topic branch
so that when it gets reintroduced, its commits are not negated by the
branch revert on master.
Sounds like a stock case out of the "using Git with topic branches"
book, so what am I missing?
--
David Kastrup
next prev parent reply other threads:[~2014-04-03 9:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-01 0:29 What's cooking in git.git (Mar 2014, #08; Mon, 31) Junio C Hamano
2014-04-01 0:53 ` Duy Nguyen
2014-04-01 19:17 ` Junio C Hamano
2014-04-01 23:40 ` Duy Nguyen
2014-04-02 23:22 ` emacs buffer names Stephen Leake
2014-04-01 22:03 ` What's cooking in git.git (Mar 2014, #08; Mon, 31) Junio C Hamano
2014-04-02 5:05 ` David Kastrup [this message]
2014-04-02 19:41 ` Junio C Hamano
2014-04-02 20:04 ` Heiko Voigt
2014-04-03 17:15 ` 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=87ha6cian0.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--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).