Show More
@@ -681,7 +681,7 b' def unshelvecontinue(ui, repo, state, op' | |||||
681 | raise |
|
681 | raise | |
682 |
|
682 | |||
683 | shelvectx = repo['tip'] |
|
683 | shelvectx = repo['tip'] | |
684 |
if not |
|
684 | if state.pendingctx not in shelvectx.parents(): | |
685 | # rebase was a no-op, so it produced no child commit |
|
685 | # rebase was a no-op, so it produced no child commit | |
686 | shelvectx = state.pendingctx |
|
686 | shelvectx = state.pendingctx | |
687 | else: |
|
687 | else: | |
@@ -758,7 +758,7 b' def _rebaserestoredcommit(ui, repo, opts' | |||||
758 | # refresh ctx after rebase completes |
|
758 | # refresh ctx after rebase completes | |
759 | shelvectx = repo['tip'] |
|
759 | shelvectx = repo['tip'] | |
760 |
|
760 | |||
761 |
if not |
|
761 | if tmpwctx not in shelvectx.parents(): | |
762 | # rebase was a no-op, so it produced no child commit |
|
762 | # rebase was a no-op, so it produced no child commit | |
763 | shelvectx = tmpwctx |
|
763 | shelvectx = tmpwctx | |
764 | return shelvectx |
|
764 | return shelvectx |
General Comments 0
You need to be logged in to leave comments.
Login now