Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-2219

Wierdness around interactive rebase, and amend commit

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Unresolved
    • Icon: Low Low
    • None
    • 1.8.1
    • Git
    • None
    • Mac OS X 10.9.2

    • Severity 3 - Minor

      There seems to be an issue around how the interactive rebase resumes after you do an amend commit.

      Steps to reproduce:

      • Open two seperate git projects windows in sourcetree
      • On one of the projects, start an interactive rebase (I did this by right clicking a commit on the branch graph and selecting 'Rebase children of {commit hash}

        interactively')

      • In the dialog that opens, select a commit to amend
      • Click OK
      • Git HEAD should now be set to the commit you wish to amend.
      • Commit a change.
      • The rebase should now continue

      What should happen:
      The rebase should finish successfully.

      What actually happens:
      The rebase finishes successfully, but for every other project that is open (or has been opened since sourcetree was launched), it will attempt to do a rebase on those projects.

      If those projects weren't in the rebase state, it would throw up an error dialog saying theres 'Errors during Merge. No rebase in progress?'. If those projects were in a rebase state, it should try to continue the rebase.

              Unassigned Unassigned
              239bd39eea10 Clark Pan
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated: