[PATCH 2/3] refspec: add back a refspec_item_init() function
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jun 5, 2018, 19:54 UTC
- Message-ID
- <20180605195440.8505-3-avarab@gmail.com>
- In-Reply-To
- <20180605195440.8505-1-avarab@gmail.com>
Re-add the non-fatal version of refspec_item_init_or_die() renamed away in an earlier change to get a more minimal diff. This should be used by callers that have their own error handling.
This new function could be marked "static" since nothing outside of refspec.c uses it, but expecting future use of it, let's make it available to other users.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- refspec.c | 10 +++++++--- refspec.h | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/refspec.c b/refspec.c index 0fd392e96b..a35493e35e 100644 --- a/refspec.c +++ b/refspec.c @@ -124,12 +124,16 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet return 1; } -void refspec_item_init_or_die(struct refspec_item *item, const char *refspec, - int fetch) +int refspec_item_init(struct refspec_item *item, const char *refspec, int fetch) { memset(item, 0, sizeof(*item)); + return parse_refspec(item, refspec, fetch); +} - if (!parse_refspec(item, refspec, fetch)) +void refspec_item_init_or_die(struct refspec_item *item, const char *refspec, + int fetch) +{ + if (!refspec_item_init(item, refspec, fetch)) die("Invalid refspec '%s'", refspec); } diff --git a/refspec.h b/refspec.h index 4caaf1f8e3..9b6e64a824 100644 --- a/refspec.h +++ b/refspec.h @@ -32,6 +32,8 @@ struct refspec { int fetch; }; +int refspec_item_init(struct refspec_item *item, const char *refspec, + int fetch); void refspec_item_init_or_die(struct refspec_item *item, const char *refspec, int fetch); void refspec_item_clear(struct refspec_item *item);
-- 2.17.0.290.gded63e768a