Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-11655

Encode error on Log Analyzer not recognizing the error

    XMLWordPrintable

Details

    • Bug
    • Resolution: Tracked Elsewhere
    • Low
    • None
    • 6.0.0
    • None
    • None

    Description

      Issue Summary

      Git ver2.21.0 on the client machine using the working-tree-encoding, however, the server machine(Bitbucket Server) using the Git ver2.20.1 having an issue with the pull request. On checking on the pull request Overview page, the log runs into error but this is not shown in the Log Analyzer.

      Environment

      • Bitbucket Server ver6.0.0
      • Git Server ver2.20.1
      • Git Client ver2.21.0
      • Windows Server 2012 R2

      Steps to Reproduce

      1. Git on the client machine set with the git attribute for files: 
        working-tree-encoding=UTF-16LE-BOM
      2. Created pull request from on the UI to add the files with the UTF-16LE-BOM encoding.
      3. Visit the pull request Overview page.

      Expected Results

      The pull request to merge.

      Actual Results

      The Bitbucket Server pull request Overview > Merge shows: "Bitbucket Server could not create the merge diff for this pull request"

      The log show the following:

      Caused by: com.atlassian.bitbucket.scm.CommandFailedException: 'C:\Program Files\Git\cmd\git.exe merge -m Automatic merge --no-ff --no-log --allow-unrelated-histories 353070fab17aced3ee9d72f7bf0bd8a096e0b3c9' exited with code 0 saying: error: failed to encode 'src/FileHandlerSvc/FileHandlerSvc.rc' from UTF-8 to UTF-16LE-BOM
error: failed to encode 'src/FileHandlerSvc/Handler_msgs.mc' from UTF-8 to UTF-16LE-BOM
error: failed to encode 'src/IPCS/IPCS.rc' from UTF-8 to UTF-16LE-BOM
error: failed to encode 'src/IPCS/IPCS_msgs.mc' from UTF-8 to UTF-16LE-BOM
error: failed to encode 'src/MsgSend/MsgSend.rc' from UTF-8 to UTF-16LE-BOM
error: failed to encode 'src/MsgSlurp/MsgSlurp.rc' from UTF-8 to UTF-16LE-BOM
at com.atlassian.bitbucket.scm.DefaultCommandExitHandler.onError(DefaultCommandExitHandler.java:47)
at com.atlassian.bitbucket.scm.git.command.GitCommandExitHandler.onError(GitCommandExitHandler.java:212)
at com.atlassian.bitbucket.scm.DefaultCommandExitHandler.onExit(DefaultCommandExitHandler.java:32)
at com.atlassian.bitbucket.scm.BaseCommand.callExitHandler(BaseCommand.java:153)
at com.atlassian.bitbucket.scm.BaseCommand$CommandFuture.internalGet(BaseCommand.java:287)
at com.atlassian.bitbucket.scm.BaseCommand$CommandFuture.get(BaseCommand.java:251)
at com.atlassian.bitbucket.scm.BaseCommand.call(BaseCommand.java:87)
at com.atlassian.stash.internal.scm.git.porcelain.AbstractTimedRequest.configureAndCall(AbstractTimedRequest.java:42)
at com.atlassian.stash.internal.scm.git.merge.DefaultMergeStrategy.merge(DefaultMergeStrategy.java:57)
at com.atlassian.stash.internal.scm.git.merge.TimedMergeStrategy.merge(TimedMergeStrategy.java:37)
at com.atlassian.stash.internal.scm.git.merge.MergeCommand.doMerge(MergeCommand.java:139)
at com.atlassian.stash.internal.scm.git.pull.PullRequestAutoMergeCommand.doMerge(PullRequestAutoMergeCommand.java:105)
at com.atlassian.stash.internal.scm.git.merge.MergeCommand.doWithWorkTree(MergeCommand.java:144)
... 78 common frames omitted

      Workaround

      Currently there is no known workaround for this behavior. A workaround will be added here when available

      Attachments

        Issue Links

          is incorporated by

          Suggestion - BSERV-11593 Add support for Git 2.21

          • Closed

          Activity

            People

              Unassigned Unassigned
              bannamalai Baskar Annamalai (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: