From: Phillip Susi <psusi@ubuntu.com>
To: git@vger.kernel.org
Subject: Re: git rebase --skip stuck in a loop
Date: Thu, 12 Jun 2014 21:16:34 -0400 [thread overview]
Message-ID: <539A50F2.40206@ubuntu.com> (raw)
In-Reply-To: <20140613010256.GD368384@vauxhall.crustytoothpaste.net>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
On 06/12/2014 09:02 PM, brian m. carlson wrote:
> On Thu, Jun 12, 2014 at 05:01:16PM -0400, Phillip Susi wrote:
>> So nobody has any ideas on what to check for or how to debug
>> this?
>
> 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? ).
I had spoken to another Ubuntu dev who said that he had this happen to
him once too and he just did an abort and tried again and the problem
went away, so it seems hard to reproduce, which is why I have
preserved the problem to try and analyze it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBCgAGBQJTmlDyAAoJEI5FoCIzSKrwN0IH/R6ny2h1XLv3Rj2Aed6C8xzU
+XsiNo6RYG9++Jk3vr705CVnmWx+4lwhr7E6jW9ValdDKEYjamypeQUyqrWSokiH
IajIMc4BNowGW7Eg1uRV8KQfb1P+QtmxBMwumOnOYk9zPfA9JcmlPVT6g5LrKy9N
6TMIlCMY1v0WPKZhseYYWHayP8PHF8KqSVuGIAZoPKPQdOQjNAOLW+PPbxiQKCcB
PrspPx+hNk4NUUm8156BdJO+xEGQpSYIY384yo0dEfvh3QHB4z/wTv84/9APxEQO
rV+67fW1psrFX+GkUolL9WFCBOeZRk3nykYJRravSOuOJKBa9laGAmiJT/EjWYI=
=DONL
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2014-06-13 1:16 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 [this message]
2014-06-13 7:34 ` Jeff King
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=539A50F2.40206@ubuntu.com \
--to=psusi@ubuntu.com \
--cc=git@vger.kernel.org \
/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).