From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Dec 2021 17:39:54 +0000 (-0800)
Subject: Merge branch 'ab/parse-options-cleanup'
X-Git-Tag: v2.35.0-rc0~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc32aa1e63218b0011159af4703e1389354c69f9;p=thirdparty%2Fgit.git

Merge branch 'ab/parse-options-cleanup'

Change the type of an internal function to return an enum (instead
of int) and replace -2 that was used to signal an error with -1.

* ab/parse-options-cleanup:
  parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()
---

bc32aa1e63218b0011159af4703e1389354c69f9