From: "Torsten Bögershausen" <tboegi@web•de>
To: "Ramsay Jones" <ramsay@ramsayjones•plus.com>,
"Eric Sunshine" <sunshine@sunshineco•com>,
"Torsten Bögershausen" <tboegi@web•de>
Cc: Git Mailing List <git@vger•kernel.org>
Subject: Re: ./t3310 fixed, t3400 broken
Date: Thu, 31 Dec 2015 16:47:23 +0100 [thread overview]
Message-ID: <56854E0B.9010205@web.de> (raw)
In-Reply-To: <56851E2E.4050403@ramsayjones.plus.com>
> t3310-notes-merge-manual-resolve.sh
>failed during a short window (due to commit 2bd811ec) and
> has already been fixed in commit 3a74ea38 ("notes: allow merging
> from arbitrary references", 29-12-2015).
Yes, it's fixed. Sorry for the noise.
The next failure is t3400.
Is there a chance to squeeze in this diff ?
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -259,11 +259,11 @@ test_expect_success 'rebase duplicated commit with
--keep-empty' '
git reset --hard &&
git checkout master &&
- >x && git add x && git commit x -mx &&
- echo x >x && git commit x -mx1 &&
+ >y && git add y && git commit y -my &&
+ echo y >y && git commit y -my1 &&
git checkout -b duplicated HEAD~ &&
- echo x >x && git commit x -mx2 &&
+ echo y >y && git commit y -my2 &&
git rebase --keep-empty master
'
>
> ATB,
> Ramsay Jones
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger•kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
prev parent reply other threads:[~2015-12-31 15:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-30 13:20 ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ? Torsten Bögershausen
2015-12-31 6:08 ` Eric Sunshine
2015-12-31 12:23 ` Ramsay Jones
2015-12-31 15:47 ` Torsten Bögershausen [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56854E0B.9010205@web.de \
--to=tboegi@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=ramsay@ramsayjones$(echo .)plus.com \
--cc=sunshine@sunshineco$(echo .)com \
/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