From: Junio C Hamano <gitster@pobox•com>
To: Fabian Ruch <bafain@gmail•com>
Cc: git@vger•kernel.org, Eric Wong <normalperson@yhbt•net>
Subject: Re: [PATCH v1] rebase -m: Use empty tree base for parentless commits
Date: Thu, 09 Oct 2014 13:18:42 -0700 [thread overview]
Message-ID: <xmqqoatl574t.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <5436E83A.7070603@gmail.com> (Fabian Ruch's message of "Thu, 09 Oct 2014 21:55:38 +0200")
Fabian Ruch <bafain@gmail•com> writes:
>> The interface to "git-merge-$strategy" is designed in such a way
>> that each strategy should be capable of taking _no_ base at all.
>
> The merge strategies "resolve" and "octopus" seem to refuse to run if no
> base is specified. The former silently exits if no bases are given and
> the latter dies saying "Unable to find common commit".
That just means these two strategies are not prepared to do a merge
without base (yet). It does not automatically give license to the
caller to pass a random tree as if it is the merge base the user
wanted to use.
For "resolve", I think it is OK for it to detect that the caller did
not give a common ancestor tree and use an empty tree when merging
(which is what merge-recursive ends up doing internally).
I am not offhand sure if the same is sensible for "octopus", though.
next prev parent reply other threads:[~2014-10-09 20:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-07 18:30 Apparent bug in git rebase with a merge commit David M. Lloyd
2014-10-09 18:50 ` [PATCH v1] rebase -m: Use empty tree base for parentless commits Fabian Ruch
2014-10-09 19:05 ` Junio C Hamano
2014-10-09 19:55 ` Fabian Ruch
2014-10-09 20:18 ` Junio C Hamano [this message]
2014-10-13 18:43 ` Fabian Ruch
2014-10-09 19:06 ` Derek Moore
2014-10-09 19:20 ` David M. Lloyd
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=xmqqoatl574t.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=bafain@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=normalperson@yhbt$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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