[SCM-584] Checkout branch with Git uses unfamiliar command sequence which leads to errors during checkout

• Type: Bug
• Status: Closed
• Priority: Critical
• Resolution: Fixed
• Affects Version/s: 1.4
• Fix Version/s: 1.7
• Component/s: maven-scm-provider-gitexe
• Assignee: Olivier Lamy
• Reporter: Daniel Strassenburg
• Created: 19/Nov/10 04:14
• Updated: 30/Apr/12 06:19
• Resolved: 30/Apr/12 06:19

Description

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.

[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