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

            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.

            The problem used to happen for me multiple times per day. Since installing the new jar file last week, it has not happened a single time.

            Steve Woodruff added a comment - The problem used to happen for me multiple times per day. Since installing the new jar file last week, it has not happened a single time.

            Attached JAR that fixed the issue in 5.6.2 version. Problem should be completely fixed in 5.7

            Krystian Brazulewicz added a comment - Attached JAR that fixed the issue in 5.6.2 version. Problem should be completely fixed in 5.7

            mrutten added a comment -

            Steve,
            this is great news!
            Looking forward to upcoming Bamboo releases, fingers crossed.

            mrutten added a comment - Steve, this is great news! Looking forward to upcoming Bamboo releases, fingers crossed.

            Atlassian provided me with a patch that resolved this issue for me. Perhaps it'll be in the next Bamboo release.

            Steve Woodruff added a comment - Atlassian provided me with a patch that resolved this issue for me. Perhaps it'll be in the next Bamboo release.

            We're currently on evaluation license, but I can't proceed with evaluations because of this. I wonder if it's possible to suspend the evaluation time until this has been fixed?

            Starcounter AB added a comment - We're currently on evaluation license, but I can't proceed with evaluations because of this. I wonder if it's possible to suspend the evaluation time until this has been fixed?

            This is a showstopper for us as well.

            Starcounter AB added a comment - This is a showstopper for us as well.

            +1 we have about 12 plans with many many branches that need to be merged manually now and fail 90% of the times. this fix would really help a lot!

            Frank Grupe added a comment - +1 we have about 12 plans with many many branches that need to be merged manually now and fail 90% of the times. this fix would really help a lot!

            I should mention that this is happening for me in Bamboo 5.5

            Steve Woodruff added a comment - I should mention that this is happening for me in Bamboo 5.5

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

                Created:
                Updated:
                Resolved: