[jboss-jira] [JBoss JIRA] (AS7-5115) Report master SHA1 before pull request gets rebased

Thomas Diesler (JIRA) jira-events at lists.jboss.org
Wed Jul 4 02:13:12 EDT 2012


Thomas Diesler created AS7-5115:
-----------------------------------

             Summary: Report master SHA1 before pull request gets rebased
                 Key: AS7-5115
                 URL: https://issues.jboss.org/browse/AS7-5115
             Project: Application Server 7
          Issue Type: Task
          Components: Test Suite
            Reporter: Thomas Diesler
            Assignee: Jason Greene
             Fix For: 7.2.0.Alpha1


For a successful merge like [this|http://lightning.mw.lab.eng.bos.redhat.com/jenkins/job/as7-param-pull/2943/], see 

{code}
+ git init
Initialized empty Git repository in /home/jenkins/jenkins-work/workspace/as7-param-pull/.git/
+ git config user.email jenkins at example.com
+ git config user.name 'Mr. Jenkins'
+ git remote add origin git://github.com/jbossas/jboss-as.git
+ git fetch origin master:refs/remotes/origin/master
>From git://github.com/jbossas/jboss-as
 * [new branch]      master     -> origin/master
>From git://github.com/jbossas/jboss-as
...
 * [new tag]         7.1.2.Final -> 7.1.2.Final
+ git fetch origin refs/pull/2593/head
>From git://github.com/jbossas/jboss-as
 * branch            refs/pull/2593/head -> FETCH_HEAD
+ git checkout FETCH_HEAD
...
Checking out files: 100% (9519/9519), done.
Note: checking out 'FETCH_HEAD'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at 3a64ae5... [AS7-5052] Allow WAR deployments as OSGi bundles
+ git rebase origin/master
First, rewinding head to replay your work on top of it...
Applying: [AS7-4918] Registered module using OSGi capability not visible as a bundle
Applying: [AS7-5049] Allow bundles to get resolved/activated during deployment unit processing
Applying: [AS7-5104] Remove no-start behaviour for test bundle deployments
Applying: [AS7-5093] Allow JDBC driver deployments as OSGi bundles
Applying: [AS7-5052] Allow WAR deployments as OSGi bundles
{code}

This tells me that the rebase was ok, but not onto what master revision it happened. Hence I cannot reproduce this run locally.



--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        


More information about the jboss-jira mailing list