Skip to content

Commit e929264

Browse files
committed
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()
2 parents ce858c0 + f91b273 commit e929264

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

builtin/symbolic-ref.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
6767
if (!strcmp(argv[0], "HEAD") &&
6868
!starts_with(argv[1], "refs/"))
6969
die("Refusing to point HEAD outside of refs/");
70-
create_symref(argv[0], argv[1], msg);
70+
ret = !!create_symref(argv[0], argv[1], msg);
7171
break;
7272
default:
7373
usage_with_options(git_symbolic_ref_usage, options);

t/t1401-symbolic-ref.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,26 @@ test_expect_success LONG_REF 'we can parse long symbolic ref' '
9292
test_cmp expect actual
9393
'
9494

95+
test_expect_success 'symbolic-ref reports failure in exit code' '
96+
test_when_finished "rm -f .git/HEAD.lock" &&
97+
>.git/HEAD.lock &&
98+
test_must_fail git symbolic-ref HEAD refs/heads/whatever
99+
'
100+
101+
test_expect_success 'symbolic-ref writes reflog entry' '
102+
git checkout -b log1 &&
103+
test_commit one &&
104+
git checkout -b log2 &&
105+
test_commit two &&
106+
git checkout --orphan orphan &&
107+
git symbolic-ref -m create HEAD refs/heads/log1 &&
108+
git symbolic-ref -m update HEAD refs/heads/log2 &&
109+
cat >expect <<-\EOF &&
110+
update
111+
create
112+
EOF
113+
git log --format=%gs -g >actual &&
114+
test_cmp expect actual
115+
'
116+
95117
test_done

0 commit comments

Comments
 (0)