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

After Merge Submodules are not set to the correct Commit

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Unresolved
    • Icon: Medium Medium
    • None
    • 2.0.2
    • Git
    • None
    • Severity 2 - Major

      Reproduction:

      • Create a branch
      • In a submodule commit some changes
      • Commit the submodule commit ref change in the parent repo
      • Merge the branch into another branch
      • The merge commit contains the correct submodule commit ref, but the submodule is currently set to the old commit ref, and is listed in the working copy changes

      TL;DR: When merging a branch with submodule changes, we always have to reset the submodule afterwards.

            [SRCTREE-2792] After Merge Submodules are not set to the correct Commit

            Deleted Account (Inactive) added a comment -

            I think this is not really a bug in SourceTree, Git works like this: the local Submodules are not updated automatically. Apart from "reseting" the submodule, you can just do a "git submodule update" and that fixes it as well. However, a feature of automatically updating submodules would be welcome in SourceTree for sure.

            Deleted Account (Inactive) added a comment - I think this is not really a bug in SourceTree , Git works like this: the local Submodules are not updated automatically. Apart from "reseting" the submodule, you can just do a "git submodule update" and that fixes it as well. However, a feature of automatically updating submodules would be welcome in SourceTree for sure.

              Unassigned Unassigned
              6685795f6817 Fabian Ehrentraud
              Affected customers:
              2 This affects my team
              Watchers:
              4 Start watching this issue

                Created:
                Updated: