зеркало из https://github.com/microsoft/git.git
Merge branch 'jk/symbolic-ref-maint' into 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()
This commit is contained in:
Коммит
e002527582
|
@ -67,7 +67,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
|
||||||
if (!strcmp(argv[0], "HEAD") &&
|
if (!strcmp(argv[0], "HEAD") &&
|
||||||
!starts_with(argv[1], "refs/"))
|
!starts_with(argv[1], "refs/"))
|
||||||
die("Refusing to point HEAD outside of refs/");
|
die("Refusing to point HEAD outside of refs/");
|
||||||
create_symref(argv[0], argv[1], msg);
|
ret = !!create_symref(argv[0], argv[1], msg);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
usage_with_options(git_symbolic_ref_usage, options);
|
usage_with_options(git_symbolic_ref_usage, options);
|
||||||
|
|
|
@ -63,4 +63,26 @@ test_expect_success 'symbolic-ref fails to delete real ref' '
|
||||||
'
|
'
|
||||||
reset_to_sane
|
reset_to_sane
|
||||||
|
|
||||||
|
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
|
test_done
|
||||||
|
|
Загрузка…
Ссылка в новой задаче