summaryrefslogtreecommitdiff
path: root/refspec.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2018-06-05 19:54:39 +0000
committerJunio C Hamano <gitster@pobox.com>2018-06-11 10:11:31 -0700
commitc495fd3d1b4b6b395346a8832edbea25f0d60ee7 (patch)
tree115691e84ad21446a3b36b9ff4f10afbdc4f3922 /refspec.c
parentdc0642218306190a2d284f47f75d71aeeaa34d02 (diff)
downloadgit-c495fd3d1b4b6b395346a8832edbea25f0d60ee7.tar.gz
refspec: add back a refspec_item_init() function
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refspec.c')
-rw-r--r--refspec.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/refspec.c b/refspec.c
index 54b6fe0c6d..597ddf8b52 100644
--- a/refspec.c
+++ b/refspec.c
@@ -122,12 +122,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);
}