From: Junio C Hamano <gitster@pobox.com>
To: Ben Woosley <ben.woosley@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: make test Unexpected passes
Date: Sun, 24 Apr 2016 12:09:00 -0700 [thread overview]
Message-ID: <xmqqtwiqn7sj.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <loom.20160423T011428-888@post.gmane.org> (Ben Woosley's message of "Fri, 22 Apr 2016 23:16:16 +0000 (UTC)")
Ben Woosley <ben.woosley@gmail.com> writes:
> These know breakages:
>
> ok 50 - rebase -m --onto --root
> ok 54 - rebase -m without --onto --root with disjoint history
>
> Have to do with rebasing a root/orphan branch with the -m flag,
> which defaults to -- merge=recursive, which is the case the patch fixed.
>
> Here are the necessary changes:
> ...
Thanks, will squash them in and reword the log message accordingly.
git-rebase--merge: don't include absent parent as a base
Absent this fix, attempts to rebase an orphan branch using "rebase -m"
fails with:
$ git rebase -m ORPHAN_TARGET_BASE
First, rewinding head to replay your work on top of it...
...
Note the default rebase behavior does not fail:
$ git rebase ORPHAN_TARGET_BASE
First, rewinding head to replay your work on top of it...
Applying: ORPHAN_ROOT_COMMIT_MSG
Using index info to reconstruct a base tree...
A few tests were expecting the old behaviour to forbid rebasing such
a history with "rebase -m", which now need to expect them to succeed.
Signed-off-by: Ben Woosley <ben.woosley@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
prev parent reply other threads:[~2016-04-24 19:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-22 20:05 make test Unexpected passes Ramsay Jones
2016-04-22 22:19 ` Elijah Newren
2016-04-27 22:05 ` Junio C Hamano
2016-04-27 22:39 ` Elijah Newren
2016-04-22 23:16 ` Ben Woosley
2016-04-24 19:09 ` Junio C Hamano [this message]
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=xmqqtwiqn7sj.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=ben.woosley@gmail.com \
--cc=git@vger.kernel.org \
/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).