Preserve v in tags if latest tag also has a v

README.md

@@ -143,6 +143,6 @@ Available options:
 
 ```
   -P, --no-push-flag   Will not push local changes to remote
-  -M, --no-merge-flag  Will not merge after creating tag if called with -c
+  -M, --no-merge-flag  Will not merge after creating tag
   -h, --help           output usage information
 ```

src/lib/helpers.ts

@@ -127,6 +127,10 @@ export async function getBranchPrompt(branch, defaultName?) {
   return branch;
 }
 
+function shouldPrependWithV(tag) {
+  return fs.existsSync('package.json') || tag.startsWith('v');
+}
+
 export async function getTagPrompt(tag, msg, nextRelease?) {
   if (!tag) {
     const latestTagCommit = exec('git rev-list --tags --max-count=1', { log: false });
@@ -138,7 +142,7 @@ export async function getTagPrompt(tag, msg, nextRelease?) {
     }
     ({ tagName: tag } = await inquirer.prompt(tagName(tag, msg)));
   }
-  return (fs.existsSync('package.json') ? 'v' : '') + semver.valid(tag);
+  return (shouldPrependWithV(tag) ? 'v' : '') + semver.valid(tag);
 }
 
 export function createTag(tag, branch) {
@@ -171,19 +175,16 @@ export function createTag(tag, branch) {
   revert(`git tag -d ${tag}`);
 
   if (getConfig().CHANGE_VERSIONS_WHEN_TAGGING && fs.existsSync('pom.xml')) {
-    const nextVersion = `${semver.inc(tag, 'minor')}-SNAPSHOT`;
+    const nextVersion = `${shouldPrependWithV(tag) ? 'v' : ''}${semver.inc(tag, 'minor')}-SNAPSHOT`;
     exec(`mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${nextVersion}`);
     const commitMessage = `prepare for next development iteration ${nextVersion}`;
     exec(`git commit -am "[oneflow] ${commitMessage}"`);
   }
 
   getConfig().RUN_CMD_AFTER_TAG_CREATION &&
-    exec(
-      getConfig()
-        .RUN_CMD_AFTER_TAG_CREATION.replace('${tag}', tag)
-        .replace('${branch}', branch),
-      { interactive: true }
-    );
+    exec(getConfig().RUN_CMD_AFTER_TAG_CREATION.replace('${tag}', tag).replace('${branch}', branch), {
+      interactive: true
+    });
 }
 
 export async function prompt(msg): Promise<boolean> {

src/lib/index.ts

@@ -101,8 +101,8 @@ function init() {
     .addOption('push', 'Pushes local changes to remote', 'Will not push local changes to remote')
     .addOption(
       'merge',
-      'Will merge after creating tag if called with -c',
-      'Will not merge after creating tag if called with -c'
+      'Will merge after creating tag',
+      'Will not merge after creating tag'
     )
     .action(wrap(releaseClose));
 

src/test/helpers-test.ts

@@ -17,7 +17,7 @@ describe.skip('helpers', function() {
         .local('git add . && git commit -m "adding version files"')
         .oneflow('release-create master 1.1.0 -p')
         .oneflow('release-close 1.1.0 -p')
-        .assertLocalCommitMsg('[oneflow] prepare for next development iteration 1.2.0-SNAPSHOT')
+        .assertLocalCommitMsg('[oneflow] prepare for next development iteration v1.2.0-SNAPSHOT')
         .assertLocalCommitMsg('[oneflow] v1.1.0', -1);
 
       const { commit: commitOfTag } = this.getCommit('v1.1.0');