[PATCH 1/4] symbolic-ref: propagate error code from create_symref()
- From
Jeff King <peff@peff.net>
- Date
- Dec 20, 2015, 07:27 UTC
- Message-ID
- <20151220072718.GA30662@sigill.intra.peff.net>
- In-Reply-To
- <20151220072637.GA22102@sigill.intra.peff.net>
If create_symref() fails, git-symbolic-ref will still exit with code 0, and our caller has no idea that the command did nothing.
This appears to have been broken since the beginning of time (e.g., it is not a regression where create_symref() stopped calling die() or something similar).
Signed-off-by: Jeff King <peff@peff.net> --- builtin/symbolic-ref.c | 2 +- t/t1401-symbolic-ref.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c index ce0fde7..9c29a64 100644 --- a/builtin/symbolic-ref.c +++ b/builtin/symbolic-ref.c @@ -67,7 +67,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix) if (!strcmp(argv[0], "HEAD") && !starts_with(argv[1], "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; default: usage_with_options(git_symbolic_ref_usage, options); diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh index 20b022a..fbb4835 100755 --- a/t/t1401-symbolic-ref.sh +++ b/t/t1401-symbolic-ref.sh @@ -92,4 +92,10 @@ 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_done
-- 2.7.0.rc1.350.g9acc0f4