Browse Source
Merge pull request #880 from trapexit/branch-parse-fix
fix parsing of relative branch paths
pull/883/head
trapexit
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
1 deletions
-
src/branches.cpp
-
tests/tests.cpp
|
|
|
@ -79,7 +79,9 @@ namespace l |
|
|
|
{ |
|
|
|
uint64_t offset; |
|
|
|
|
|
|
|
offset = s_.find_first_of('/'); |
|
|
|
offset = s_.find_first_not_of("+<>-="); |
|
|
|
if(offset > 1) |
|
|
|
offset = 2; |
|
|
|
*instr_ = s_.substr(0,offset); |
|
|
|
if(offset != std::string::npos) |
|
|
|
*values_ = s_.substr(offset); |
|
|
|
|
|
|
|
@ -109,6 +109,10 @@ test_config_branches() |
|
|
|
TEST_MSG("minfreespace: expected = %lu; produced = %lu", |
|
|
|
4321, |
|
|
|
(*bcp0)[1].minfreespace()); |
|
|
|
|
|
|
|
TEST_CHECK(b.from_string("foo/bar") == 0); |
|
|
|
TEST_CHECK(b.from_string("./foo/bar") == 0); |
|
|
|
TEST_CHECK(b.from_string("./foo/bar:/bar/baz:blah/asdf") == 0); |
|
|
|
} |
|
|
|
|
|
|
|
void |
|
|
|
|
