maven-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Sebastian Annies (JIRA)" <j...@codehaus.org>
Subject [jira] Updated: (SCM-584) Checkout branch with Git uses unfamiliar command sequence which leads to errors during checkout
Date Wed, 01 Dec 2010 18:21:04 GMT

     [ http://jira.codehaus.org/browse/SCM-584?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Sebastian Annies updated SCM-584:
---------------------------------

    Attachment: SCM-584.patch

Patches the problem by appending the --branch parameter to the git command in case the version
is a branch. This makes sure that a subsequent pull does what intended!

> Checkout branch with Git uses unfamiliar command sequence which leads to errors during
checkout
> -----------------------------------------------------------------------------------------------
>
>                 Key: SCM-584
>                 URL: http://jira.codehaus.org/browse/SCM-584
>             Project: Maven SCM
>          Issue Type: Bug
>          Components: maven-scm-provider-git
>    Affects Versions: 1.4
>            Reporter: Daniel Strassenburg
>            Priority: Critical
>         Attachments: SCM-584-test-prj.zip, SCM-584.patch
>
>
> I want to checkout a specific branch from my git repo using the maven-scm-plugin. The
plugin first clones the repo and gets the default branch as selected in gitorious. After that
the plugin executes git pull ... mybranch which works fine as long as there are no merge conflicts
between current branch and branch to checkout. In the case of any conflict an error occurs.
> The git checkout -b command should be used instead.
> {noformat}
> [INFO] Working directory: <a_dir>
> [INFO] Executing: /bin/sh -c cd /home/maven-proj/target/deploy-workspace && git
fetch git://gitorious/<...>/my-proj.git
> [INFO] Working directory: <a_dir>
> [INFO] Executing: /bin/sh -c cd  /home/maven-proj/target/deploy-workspace &&
git checkout HEAD
> [INFO] Working directory: <a_dir>
> [INFO] Executing: /bin/sh -c cd /home/maven-proj/target/deploy-workspace && git
ls-files
> [INFO] Working directory: <a_dir>
> [INFO] 
> [INFO] --- maven-scm-plugin:1.4:update (switch-branch) 
> [INFO] Executing: /bin/sh -c cd /home/maven-proj/target/deploy-workspace && git
pull git://gitorious/<..>/deploy.git mysql55
> [WARNING] failed to update git, return code 1
> [ERROR] Provider message:
> [ERROR] The git-pull origin master command failed.
> [ERROR] Command output:
> [ERROR] From git://gitorious/<...>/deploy
>  * branch            mysql55    -> FETCH_HEAD
> {noformat}

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

Mime
View raw message