Recently in Bamboo 5.6, git merges fails on first attempt. It takes a re-run a couple of re-runs to get this working. This happens when using the ssh git server. Bamboo will fail with error messages like:

      2014-08-06 15:43:50,641 WARN [3-DelayedChangeDetectionThread:pool-7-thread-14] [ChainExecutionManagerImpl] Exception during push: com.atlassian.bamboo.plugins.git.GitCommandException: command /usr/bin/git push ssh://b33e6530-0402-4ca1-bb24-cb094eddfdc9@127.0.0.1:54460/test/test.git bugfix/test failed with code 1. Working directory was [/var/atlassian/application-data/bamboo/xml-data/build-dir/serverSide/TESTA-TSTA25-3/mergeWorkspace]., stderr:
      Warning: Permanently added '[127.0.0.1]:54460' (RSA) to the list of known hosts.
      error: unpack failed: eof before pack header was fully read
      fatal: The remote end hung up unexpectedly
      error: error in sideband demultiplexer
      To ssh://b33e6530-0402-4ca1-bb24-cb094eddfdc9@127.0.0.1:54460/kep/kepler.git
       ! [remote rejected] bugfix/test2 -> bugfix/test (unpacker error)
      error: failed to push some refs to 'ssh://b33e6530-0402-4ca1-bb24-cb094eddfdc9@127.0.0.1:54460/test/test.git'
      2014-08-06 15:43:50,642 WARN [3-DelayedChangeDetectionThread:pool-7-thread-14] [ChainExecutionManagerImpl] Unable to push TESTA-TSTA25-3 merge result: MergeResultSummaryImpl{integrationStrategy='BRANCH_UPDATER', mergeState='SUCCESS', pushState='FAILED', failureReason='Exception during push: com.atlassian.bamboo.plugins.git.GitCommandException: command /usr/bin/git push ssh://b33e6530-0402-4ca1-bb24-cb094eddfdc9@127.0.0.1:54460/test/test.git bugfix/test1 failed with code 1. Working directory was [/var/atlassian/application-data/bamboo/xml-data/build-dir/serverSide/TESTA-TSTA25-3/mergeWorkspace]., stderr:
      Warning: Permanently added '[127.0.0.1]:54460' (RSA) to the list of known hosts.
      error: unpack failed: eof before pack header was fully read
      fatal: The remote end hung up unexpectedly
      error: error in sideband demultiplexer
      

            [BAM-14949] Bug in the SSH proxy prevents git merge

            Eduardo Alvarenga (Inactive) made changes -
            Remote Link Original: This issue links to "BDEV-6112 (Atlassian JIRA Extranet - Special Projects)" [ 75660 ] New: This issue links to "BDEV-6112 (Hello Jira)" [ 75660 ]
            Monique Khairuliana (Inactive) made changes -
            Workflow Original: Bamboo Workflow 2016 v1 - Restricted [ 1442473 ] New: JAC Bug Workflow v3 [ 3383381 ]
            Status Original: Resolved [ 5 ] New: Closed [ 6 ]
            Daniel R made changes -
            Regular Expression New: error: error in sideband demultiplexer
            Owen made changes -
            Workflow Original: Bamboo Workflow 2016 v1 [ 1419596 ] New: Bamboo Workflow 2016 v1 - Restricted [ 1442473 ]
            Marek Went (Inactive) made changes -
            Workflow Original: Bamboo Workflow 2014 v2 [ 724064 ] New: Bamboo Workflow 2016 v1 [ 1419596 ]
            Marcin Gardias made changes -
            Status Original: Deployed to Cloud [ 11272 ] New: Resolved [ 5 ]
            Marcin Gardias made changes -
            Resolution New: Fixed [ 1 ]
            Status Original: Open [ 1 ] New: Deployed to Cloud [ 11272 ]
            Marcin Gardias made changes -
            Fix Version/s New: 5.7.2 [ 44895 ]

            Ian LOUIS added a comment -

            Yes, fixed the problem also.

            Is the fix definitely included in 5.7.1 ?

            Ian LOUIS added a comment - Yes, fixed the problem also. Is the fix definitely included in 5.7.1 ?

            Same here - installing the jar file solves the problem.

            Michael Stadelmeier added a comment - Same here - installing the jar file solves the problem.

              Unassigned Unassigned
              smaiyaki Sultan Maiyaki (Inactive)
              Affected customers:
              12 This affects my team
              Watchers:
              15 Start watching this issue

                Created:
                Updated:
                Resolved: