Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-1263

Incorrect parameters for TortioseGitMerge if file path contains whitespaces

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Obsolete
    • Icon: Medium Medium
    • 3.0.17
    • 1.3.1
    • Git

    • Win 8 x64 Pro, TortoiseGit 1.8.5.4

    • Severity 2 - Major

      0. Make sure "TortoiseMerge" is selected as a merge tool.
      1. Start doing a merge in SourceTree from another branch (Git is used).
      2. Right click on conflicted file - Resolve Conflicts - Launch external merge tool

      Bug: if a file path contains whitespaces, SourceTree uses incorrect escaping with quotation marks.
      Example of command line used:
      "c:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe" -"base:./mac/Disk/Disk/App Core/SomeFile.m.BASE.9944.m" -"mine:./mac/Disk/Disk/App Core/SomeFile.m.LOCAL.9944.m" -"theirs:./mac/Disk/Disk/App Core/SomeFile.m.REMOTE.9944.m" -"merged:mac/Disk/Disk/App Core/SomeFile.m"

      Expected: TortoiseGitMerge launched successfully. Correct command line:
      "c:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe" -base:"./mac/Disk/Disk/App Core/SomeFile.m.BASE.9944.m" -mine:"./mac/Disk/Disk/App Core/SomeFile.m.LOCAL.9944.m" -theirs:"./mac/Disk/Disk/App Core/SomeFile.m.REMOTE.9944.m" -merged:"mac/Disk/Disk/App Core/SomeFile.m"

              sstreeting Steve Streeting (Inactive)
              df4da0dd479a Mykola Denysiuk
              Votes:
              3 Vote for this issue
              Watchers:
              6 Start watching this issue

                Created:
                Updated:
                Resolved: