Include Git version with yadm version (#377)
This commit is contained in:
parent
f28d4bc1c6
commit
8186705059
2 changed files with 4 additions and 3 deletions
|
@ -29,8 +29,8 @@ def test_semantic_version(expected_version):
|
||||||
@pytest.mark.parametrize('cmd', ['--version', 'version'])
|
@pytest.mark.parametrize('cmd', ['--version', 'version'])
|
||||||
def test_reported_version(
|
def test_reported_version(
|
||||||
runner, yadm_cmd, cmd, expected_version):
|
runner, yadm_cmd, cmd, expected_version):
|
||||||
"""Report correct version"""
|
"""Report correct version, include git version"""
|
||||||
run = runner(command=yadm_cmd(cmd))
|
run = runner(command=yadm_cmd(cmd))
|
||||||
assert run.success
|
assert run.success
|
||||||
assert run.err == ''
|
assert run.err == ''
|
||||||
assert run.out == f'yadm {expected_version}\n'
|
assert run.out.startswith(f'yadm version {expected_version}\ngit version')
|
||||||
|
|
3
yadm
3
yadm
|
@ -1413,7 +1413,8 @@ function upgrade() {
|
||||||
|
|
||||||
function version() {
|
function version() {
|
||||||
|
|
||||||
echo "yadm $VERSION"
|
echo "yadm version $VERSION"
|
||||||
|
"$GIT_PROGRAM" --version
|
||||||
exit_with_hook 0
|
exit_with_hook 0
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue