Skip to content

Commit 4ff9875

Browse files
committed
fix: Strip preffixes correclty
1 parent c2add2d commit 4ff9875

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

spec/git-version-spec.cr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ describe GitVersion do
319319
tmp.exec %(git merge myfeature)
320320

321321
tmp.exec %(git checkout master)
322-
tmp.exec %(git rebase dev)
322+
tmp.exec %(git rebase --no-gpg-sign dev)
323323
version = git.get_version
324324
version.should eq("1.0.1")
325325
ensure
@@ -345,7 +345,7 @@ describe GitVersion do
345345

346346
tmp.exec %(git checkout dev)
347347
tmp.exec %(git commit --no-gpg-sign --allow-empty -m "4")
348-
tmp.exec %(git rebase master)
348+
tmp.exec %(git rebase --no-gpg-sign master)
349349

350350
tmp.exec %(git checkout master)
351351
tmp.exec %(git merge --no-gpg-sign --no-ff dev)

src/git-version.cr

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@ module GitVersion
2424
end
2525

2626
private def strip_prefix(version : String) : String | Nil
27-
stripped = version.lstrip(@prefix)
28-
if @prefix != "" && stripped.size >= version.size
29-
nil
30-
else
31-
stripped
32-
end
27+
version.lchop?(@prefix)
3328
end
3429

3530
private def exec(cmd)

0 commit comments

Comments
 (0)