git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / 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	[thread overview]
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	other threads:[~2019-11-29 21:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-29  8:21 git-rebase produces incorrect output 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

  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=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
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).