From: Junio C Hamano <gitster@pobox.com>
To: Pratyush Yadav <me@yadavpratyush.com>
Cc: Denton Liu <liu.denton@gmail.com>,
Birger Skogeng Pedersen <birger.sp@gmail.com>,
Git List <git@vger.kernel.org>
Subject: Re: git-gui: missing some patches from git?
Date: Wed, 18 Sep 2019 10:49:12 -0700 [thread overview]
Message-ID: <xmqqblvh5wbr.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190918151404.rqjohdderwxfqtdm@yadavpratyush.com> (Pratyush Yadav's message of "Wed, 18 Sep 2019 20:44:04 +0530")
Pratyush Yadav <me@yadavpratyush.com> writes:
> Assuming I have git.git cloned in ../git (relative to git-gui.git), I
> ran:
>
> git pull -Xsubtree=git-gui ../git $branches
>
> instead of:
>
> git merge $branches
>
> because git-gui's tree doesn't have those commits and branches yet, so
> we can't merge straight away. This seems to have worked, but I thought
> I'd mention it in case it would cause some subtle problems.
I am not sure what your $branches above are referring to, but if you
run "git log" in the resulting git-gui repository and see any of the
commits that are about git and not git-gui, then it is not a subtle
but a grave problem. The reason why git-gui and gitk are separate
projects is because they do not want to contaminate their history
with stuff that are not related to them (e.g. changes to "git
fast-export").
Taking one of the commits Denton found as an example:
>> js/misc-git-gui-stuff: 76756d67061076c046973bff2089ad49f5dc2eb6
(by the way, this can also be found by running
git log --first-parent --min-parents=2 master -- git-gui
in git itself; 02a5f25d956be187bc0 merged it in as its second
parent. The second parents of these merges you would find are
candidates---you may already have some, and you may need to merge
others to your tree; there may be some that are direct updates to
git-gui/ part of my tree (which shouldn't have been done but
mistakes happen).
You should be able to merge this (and all other git-gui topics
already in my tree Denton pointed out) to your 'master'. If you
then make a trial merge of the result back into my tree with "git
merge -Xsubtree=git-gui", it should result in "already up to date",
i.e. a noop merge.
Thanks.
next prev parent reply other threads:[~2019-09-18 17:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 7:02 git-gui: missing some patches from git? Birger Skogeng Pedersen
2019-09-18 9:27 ` Denton Liu
2019-09-18 15:14 ` Pratyush Yadav
2019-09-18 16:56 ` Denton Liu
2019-09-18 17:49 ` Junio C Hamano [this message]
2019-09-18 19:22 ` Pratyush Yadav
2019-09-19 18:32 ` Pratyush Yadav
2019-09-19 18:47 ` Denton Liu
2019-09-19 19:03 ` Pratyush Yadav
2019-09-19 19:11 ` Denton Liu
2019-09-19 19:33 ` Denton Liu
2019-09-24 14:06 ` Pratyush Yadav
2019-09-18 17:31 ` 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=xmqqblvh5wbr.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=birger.sp@gmail.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=me@yadavpratyush.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 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 NNTP newsgroup(s).