Git Mailing List Archive on lore.kernel.org
 help / color / Atom feed
From: Pavel Roskin <plroskin@gmail.com>
To: Philip Oakley <philipoakley@iee.email>
Cc: git@vger.kernel.org
Subject: Re: git-rebase produces incorrect output
Date: Fri, 29 Nov 2019 13:28:52 -0800
Message-ID: <CAN_72e3PLSyc_qXVztrSwKn+3tFA_x1TDkmA5Pi21KZvbb0ENQ@mail.gmail.com> (raw)
In-Reply-To: <eadb7c7e-5c8c-7e0b-2be0-ddc31d6ff7d4@iee.email>

Hello Philip,

I just found out that the true diff on Github should use two dots, not three:
https://github.com/proski/git-rebase-demo/compare/merge-good..rebase-bad

The first difference is on line 187 in
getPullRequests_throws_on_not_found(). The correct change should have
"nullValue" (see the diff between "master" and "branch1"), but
"rebase-bad" has "SocketException" there instead.

[Sorry for the private email that I sent by mistake]

Pavel

  reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-29  8:21 Pavel Roskin
2019-11-29 13:31 ` Philip Oakley
2019-11-29 21:28   ` Pavel Roskin [this message]
2019-11-30  4:22 ` Elijah Newren
2019-11-30 16:37   ` Elijah Newren
2019-11-30 17:58   ` 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=CAN_72e3PLSyc_qXVztrSwKn+3tFA_x1TDkmA5Pi21KZvbb0ENQ@mail.gmail.com \
    --to=plroskin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=philipoakley@iee.email \
    /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

Git Mailing List Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/git/0 git/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 git git/ https://lore.kernel.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.git


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git