Uploaded image for project: 'JBoss Web Server'
  1. JBoss Web Server
  2. JWS-848

xbuild's `make winspec` pushes all branches

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Done
    • Icon: Major Major
    • None
    • None
    • xbuild
    • None

      The xbuild `make winspec` command pushes all branches instead of just the current one, e.g.:

      $ make winspec
      Deprecation warning: kojiconfig is deprecated. Instead, kojiprofile should be used.
      Committing changes.
      [jws-3.1-xb 112142b] Automatically generated by make winspec
       1 file changed, 4 insertions(+), 2 deletions(-)
      Counting objects: 6, done.
      Delta compression using up to 8 threads.
      Compressing objects: 100% (6/6), done.
      Writing objects: 100% (6/6), 774 bytes | 774.00 KiB/s, done.
      Total 6 (delta 4), reused 0 (delta 0)
      remote: *** No rules for jws-3.1-xb.  Happy hacking!
      remote: * Publishing information for 2 commits
      To ssh://pkgs.devel.redhat.com/rpms/tomcat7
         d3ba801..112142b  jws-3.1-xb -> jws-3.1-xb
       ! [rejected]        jb-ep-6-xb -> jb-ep-6-xb (non-fast-forward)
       ! [rejected]        jb-ews-2.1-rhel-6 -> jb-ews-2.1-rhel-6 (non-fast-forward)
       ! [rejected]        jws-3.1-rhel-7 -> jws-3.1-rhel-7 (non-fast-forward)
      error: failed to push some refs to 'ssh://csutherl@pkgs.devel.redhat.com/rpms/tomcat7'
      hint: Updates were rejected because a pushed branch tip is behind its remote
      hint: counterpart. Check out this branch and integrate the remote changes
      hint: (e.g. 'git pull ...') before pushing again.
      hint: See the 'Note about fast-forwards' in 'git push --help' for details.
      make: *** [../xbuild/Makefile.common:163: winspec] Error 1
      

      This behavior results in pushes being attempted that the user doesn't expect. A better solution than just using `git push` would be `git push origin HEAD` to push only the current branch.

              rhn-support-csutherl Coty Sutherland
              rhn-support-csutherl Coty Sutherland
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: