Re: [PATCH 1/2] t3404: demonstrate CHERRY_PICK_HEAD bug
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jun 18, 2015, 16:16 UTC
- Message-ID
- <0f55232f453ab3a75bafe17db2744552@www.dscho.org>
- In-Reply-To
- <xmqqoakdf1lu.fsf@gitster.dls.corp.google.com>
Hi Junio,
On 2015-06-18 18:00, Junio C Hamano wrote:
Show 18 quoted lines
> Johannes Schindelin <johannes.schindelin@gmx.de> writes: > >>>> + git diff seq-onto && >>> >>> I am puzzled with this "diff"; what is this about? Is it a remnant >>> from an earlier debugging session, or is it making sure seq-onto is >>> a valid tree-ish? >> >> The idea is to verify that we end up with the same tree even if we >> exchanged the latest two patches. I can remove it if you want as it is >> not strictly necessary, but I would like to keep it just to make sure >> that we did not end up with an incomplete rebase. > > I agree that such a verification is a very good thing to have here. > But you would need to ask "git diff" to signal that it found no > differences with --exit-code or --quiet, I would think. > > Thanks.
Whoops! Of course... You want me to re-roll?
Ciao, Dscho