We couldn't load all Actvitity tabs. Refresh the page to try again.
If the problem persists, contact your Jira admin.
IMPORTANT: JAC is a Public system and anyone on the internet will be able to view the data in the created JAC tickets. Please don’t include Customer or Sensitive data in the JAC ticket.
Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-1997

Pushing a subtree creates incorrect commit history using embedded git version

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Medium Medium
    • None
    • 1.8.0.2
    • Git
    • None
    • Mac OS X Mavericks
      Git 1.8.5 compiled using Homebrew

      This bug makes the synthetic history generated by SourceTree incompatible with other subtree users. The root cause seems to be an extra "-n\n" in the commit messages generated by the embedded version of Git.

      Steps to reproduce:

      1. Clone this repository: https://bitbucket.org/jennings/sourcetree-subtree-commit-message-bug
      2. Set SourceTree to use the embedded Git (version 1.8.4.2)
      3. Use "Add/Link Subtree" to link the "sub" directory with a remote repository.
      4. Push the subtree.
      5. Set SourceTree to use the system version of Git (tested with version 1.8.5)
      6. Push the subtree.

      Results:

      The subtree created using the embedded Git has a head commit ID of 6e92039. The subtree created using the system Git has a head commit ID of 329f350. Resultant repos can be seen here:

      https://bitbucket.org/jennings/sourcetree-subtree-commit-message-bug-embedded
      https://bitbucket.org/jennings/sourcetree-subtree-commit-message-bug-system

      Expected result:

      Both branch head commit IDs should be 329f350.

            Loading...
            IMPORTANT: JAC is a Public system and anyone on the internet will be able to view the data in the created JAC tickets. Please don’t include Customer or Sensitive data in the JAC ticket.
            Uploaded image for project: 'Sourcetree For Mac'
            1. Sourcetree For Mac
            2. SRCTREE-1997

            Pushing a subtree creates incorrect commit history using embedded git version

              • Icon: Bug Bug
              • Resolution: Fixed
              • Icon: Medium Medium
              • None
              • 1.8.0.2
              • Git
              • None
              • Mac OS X Mavericks
                Git 1.8.5 compiled using Homebrew

                This bug makes the synthetic history generated by SourceTree incompatible with other subtree users. The root cause seems to be an extra "-n\n" in the commit messages generated by the embedded version of Git.

                Steps to reproduce:

                1. Clone this repository: https://bitbucket.org/jennings/sourcetree-subtree-commit-message-bug
                2. Set SourceTree to use the embedded Git (version 1.8.4.2)
                3. Use "Add/Link Subtree" to link the "sub" directory with a remote repository.
                4. Push the subtree.
                5. Set SourceTree to use the system version of Git (tested with version 1.8.5)
                6. Push the subtree.

                Results:

                The subtree created using the embedded Git has a head commit ID of 6e92039. The subtree created using the system Git has a head commit ID of 329f350. Resultant repos can be seen here:

                https://bitbucket.org/jennings/sourcetree-subtree-commit-message-bug-embedded
                https://bitbucket.org/jennings/sourcetree-subtree-commit-message-bug-system

                Expected result:

                Both branch head commit IDs should be 329f350.

                        Unassigned Unassigned
                        e74945cc5897 jennings
                        Votes:
                        0 Vote for this issue
                        Watchers:
                        2 Start watching this issue

                          Created:
                          Updated:
                          Resolved:

                            Unassigned Unassigned
                            e74945cc5897 jennings
                            Affected customers:
                            0 This affects my team
                            Watchers:
                            2 Start watching this issue

                              Created:
                              Updated:
                              Resolved: