diff --git a/bin/registryReport.solo b/bin/registryReport.solo index 11bea646..fbcded84 100755 --- a/bin/registryReport.solo +++ b/bin/registryReport.solo @@ -1,7 +1,7 @@ #!/usr/bin/env superdoit_solo options { - SuperDoitOptionalOptionWithRequiredArg long: 'registry'. + SuperDoitOptionalOptionWithRequiredArg long: 'registry' short: 'r'. SuperDoitOptionalOptionWithRequiredArg long: 'projectSet'. SuperDoitOptionalOptionWithRequiredArg long: 'stone'. SuperDoitOptionalOptionWithRequiredArg long: 'template'. diff --git a/bin/updateProjectSet.solo b/bin/updateProjectSet.solo index af0ec2a2..f8b2fdb6 100755 --- a/bin/updateProjectSet.solo +++ b/bin/updateProjectSet.solo @@ -44,7 +44,7 @@ EXAMPLES $basename --registry=bosch --projectSet=dev \ --projectName=Rowan \ --gitUrl=git@github.com:GemTalk/Rowan.git - # simplest definition using a file: url to specify spec location + # simplest definition using a git url to specify spec location $basename --registry=bosch --projectSet=dev \ --projectName=Rowan \ --gitUrl=git@github.com:GemTalk/Rowan.git diff --git a/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.pull..st b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.pull..st index 0f8a60b4..0c34c7a8 100644 --- a/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.pull..st +++ b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.pull..st @@ -30,14 +30,17 @@ cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath pull: p show: ' Set ' , projectName , ' revision to ' , revision. gitTool gitcheckoutIn: gitProjectRef - with: ' -B ' , revision , ' ' , remoteName , '/' , revision. + with: ' -B ' , remoteName , '/' , revision. pull ifTrue: [ Transcript cr; show: ' Pull ' , projectName , ' revision ' , revision , ' from remote ' , origin. - gitTool gitpullIn: gitProjectRef fullName remote: remoteName branch: revision ] ]. + gitTool + gitpullIn: gitProjectRef fullName + remote: remoteName + branch: revision ] ]. cloned ifTrue: [ (gitUrls keys reject: [ :each | each = remoteName ])