diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-28 13:57:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-28 13:57:24 -0800 |
| commit | e929264e8d769cd3637279c0a2b6338f9ec1c4c3 (patch) | |
| tree | b37409a3dcc75e6fa691cf85da1d806be6516853 /t | |
| parent | ce858c06a4254633c1de29ab2ab41d7afa935065 (diff) | |
| parent | f91b2732b3df6bae21512af58e0cfccbd5301331 (diff) | |
| download | git-e929264e8d769cd3637279c0a2b6338f9ec1c4c3.tar.gz | |
Merge branch 'jk/symbolic-ref-maint'
"git symbolic-ref" forgot to report a failure with its exit status.
* jk/symbolic-ref-maint:
t1401: test reflog creation for git-symbolic-ref
symbolic-ref: propagate error code from create_symref()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1401-symbolic-ref.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh index 20b022ae33..1f0dff3a0b 100755 --- a/t/t1401-symbolic-ref.sh +++ b/t/t1401-symbolic-ref.sh @@ -92,4 +92,26 @@ test_expect_success LONG_REF 'we can parse long symbolic ref' ' test_cmp expect actual ' +test_expect_success 'symbolic-ref reports failure in exit code' ' + test_when_finished "rm -f .git/HEAD.lock" && + >.git/HEAD.lock && + test_must_fail git symbolic-ref HEAD refs/heads/whatever +' + +test_expect_success 'symbolic-ref writes reflog entry' ' + git checkout -b log1 && + test_commit one && + git checkout -b log2 && + test_commit two && + git checkout --orphan orphan && + git symbolic-ref -m create HEAD refs/heads/log1 && + git symbolic-ref -m update HEAD refs/heads/log2 && + cat >expect <<-\EOF && + update + create + EOF + git log --format=%gs -g >actual && + test_cmp expect actual +' + test_done |