From: Jeff King <peff@peff.net>
To: Phillip Susi <psusi@ubuntu.com>
Cc: git@vger.kernel.org
Subject: Re: git rebase --skip stuck in a loop
Date: Fri, 13 Jun 2014 03:34:46 -0400 [thread overview]
Message-ID: <20140613073446.GF7908@sigill.intra.peff.net> (raw)
In-Reply-To: <539A50F2.40206@ubuntu.com>
On Thu, Jun 12, 2014 at 09:16:34PM -0400, Phillip Susi wrote:
> > I'm assuming this works in the general case, because we have tests
> > for it. Do you perhaps have a repository and a set of reproduction
> > steps we could use to try to reproduce this?
> >
> > If you can get that information, I'm interested in trying to fix
> > it.
>
> I don't have a set of reproduction steps, but I do still have the repo
> that is in this stuck state if there is any data you might want me to
> pull out of it ( .git/rebase-apply? ).
Thanks for saving the stuck state.
If it's possible to share the whole repo, it might be worth seeing (then
we can all just run "git rebase --continue" ourselves). If it's too big
or is confidential, just tarring up .git/rebase-apply and making it
available is probably a good first step.
-Peff
next prev parent reply other threads:[~2014-06-13 7:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-10 18:57 git rebase --skip stuck in a loop Phillip Susi
2014-06-12 21:01 ` Phillip Susi
2014-06-13 1:02 ` brian m. carlson
2014-06-13 1:16 ` Phillip Susi
2014-06-13 7:34 ` Jeff King [this message]
2014-06-13 14:15 ` Phillip Susi
2014-06-15 22:39 ` brian m. carlson
2014-06-16 0:01 ` [PATCH] rebase--merge: fix --skip with two conflicts in a row brian m. carlson
2014-06-16 20:31 ` 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=20140613073446.GF7908@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=psusi@ubuntu.com \
/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.
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 NNTP newsgroup(s).