From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2019 21:27:14 +0000 (-0700)
Subject: Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint
X-Git-Tag: v2.23.0-rc0~6^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2c30e34e1a50f9d14fce8f97f3639ac0ebccd819?hp=24c161ddd6f614d27a12eebd53c9476cfb87c0ab

Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint

Code cleanup.

* js/bisect-helper-check-get-oid-return-value:
bisect--helper: verify HEAD could be parsed before continuing
---

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index e7325fe37f..1fbe156e67 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -570,7 +570,10 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 	write_file(git_path_bisect_start(), "%s\n", start_head.buf);
 
 	if (no_checkout) {
-		get_oid(start_head.buf, &oid);
+		if (get_oid(start_head.buf, &oid) < 0) {
+			retval = error(_("invalid ref: '%s'"), start_head.buf);
+			goto finish;
+		}
 		if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0,
 			       UPDATE_REFS_MSG_ON_ERR)) {
 			retval = -1;