Merge branch 'master' into devonfw#1112-Version-prefix-not-working-as…

…-expected

CHANGELOG.asciidoc

@@ -6,6 +6,7 @@ This file documents all notable changes to https://github.com/devonfw/ide[devonf
 
 Release with new features and bugfixes:
 
+* https://github.com/devonfw/ide/issues/1158[#1158]: Projects main-branch is always checked out  
 * https://github.com/devonfw/ide/issues/1118[#1118]: Add milestone versions of Eclipse
 
 The full list of changes for this release can be found in https://github.com/devonfw/ide/milestone/44?closed=1[milestone 2023.05.001].

scripts/src/main/resources/scripts/command/project

@@ -84,7 +84,12 @@ function doImportProject() {
   project_workspace_path="${DEVON_IDE_HOME}/workspaces/${project_workspace}"
   mkdir -p "${project_workspace_path}"
   cd "${project_workspace_path}" || exit 255
-  doGitPullOrClone "${project_path}" "${project_git_url}" "${project_git_branch}"
+  local target_git_url="${project_git_url}"
+  if [ -n "${project_git_branch}" ]
+  then
+    target_git_url="${project_git_url}#${project_git_branch}"
+  fi
+  doGitPullOrClone "${project_path}" "${target_git_url}"
   doDebug "Building project with devon command: ${project_build_cmd}"
   if [ -n "${project_build_cmd}" ]
   then