From: Andriy Gapon <avg@FreeBSD.org>
To: git@vger.kernel.org
Subject: Re: Bug in git rebase --continue in v1.8.4
Date: Wed, 04 Sep 2013 11:02:04 +0300 [thread overview]
Message-ID: <5226E8FC.8070208@FreeBSD.org> (raw)
In-Reply-To: 5221E661.1070200@gmx.de
Christoph Mallon said:
> if I run rebase --continue (e.g. after a conflict resolution), then the rebase always ends with this error message:
> It seems that there is already a rebase-apply directory, and
> I wonder if you are in the middle of another rebase. If that is the
> case, please try
> git rebase (--continue | --abort | --skip)
> If that is not the case, please
> rm -fr "/home/tron/gitRebaseTest/test/.git/rebase-apply"
> and run me again. I am stopping in case you still have something
> valuable there.
>
> This happens on git v1.8.4 on FreeBSD. It is fine with v1.8.3.4.
I observe exactly the same problem.
I also use FreeBSD and the problem started with 1.8.4.
Judging by the lack of followups, could this be a FreeBSD-specific problem?
Any thoughts / suggestions?
Thank you!
> It seems to be caused by
> a1549e1049439386b9fd643fae236ad3ba649650, specifically this hunk:
> --- a/git-rebase--am.sh
> +++ b/git-rebase--am.sh
> <at> <at> -7,12 +7,12 <at> <at> case "$action" in
> continue)
> git am --resolved --resolvemsg="$resolvemsg" &&
> move_to_original_branch
> - exit
> + return
> ;;
> skip)
> git am --skip --resolvemsg="$resolvemsg" &&
--
Andriy Gapon
next prev parent reply other threads:[~2013-09-04 8:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-31 12:49 Bug in git rebase --continue in v1.8.4 Christoph Mallon
2013-09-04 8:02 ` Andriy Gapon [this message]
2013-09-04 8:18 ` Matthieu Moy
2013-09-04 8:53 ` Andriy Gapon
2013-09-04 9:17 ` Andriy Gapon
2013-09-04 11:56 ` Matthieu Moy
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=5226E8FC.8070208@FreeBSD.org \
--to=avg@freebsd.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.