git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
* rebase / am separation problem
@ 2019-06-10 15:07 Michal Suchánek
  2019-06-10 18:46 ` Johannes Schindelin
  0 siblings, 1 reply; 2+ messages in thread
From: Michal Suchánek @ 2019-06-10 15:07 UTC (permalink / raw)
  To: git

Hello,

there is an issue with rebase vs am separation.

I am using git 2.20.1 and just observed this behavior:

 - rebase started ( possibly with previous am in progress on 
   different branch - not known)
 - rebase stopped, used am --skip to continue
 - renase was not able to finish

Does anybody else observe this issue?

There is some nesting possible - I am sure that at least one of
cherry-pick and am can be included on top of a commit where git stopped
during rebase -i. However, git should either isolate the three properly
so they can be layered one on top of another of reject the command if
it would corrupt state of currently running command.

Thanks

Michal

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: rebase / am separation problem
  2019-06-10 15:07 rebase / am separation problem Michal Suchánek
@ 2019-06-10 18:46 ` Johannes Schindelin
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2019-06-10 18:46 UTC (permalink / raw)
  To: Michal Suchánek; +Cc: git

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

Hi Michal

On Mon, 10 Jun 2019, Michal Suchánek wrote:

> I am using git 2.20.1 and just observed this behavior:

Have you tested this with v2.21.0 (which is over three months old by now),
or even v2.22.0?

Ciao,
Johannes

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-10 15:07 rebase / am separation problem Michal Suchánek
2019-06-10 18:46 ` Johannes Schindelin

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox