Skip to content

Commit c495fd3

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent dc06422 commit c495fd3

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

refspec.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,16 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet
122122
return 1;
123123
}
124124

125-
void refspec_item_init_or_die(struct refspec_item *item, const char *refspec,
126-
int fetch)
125+
int refspec_item_init(struct refspec_item *item, const char *refspec, int fetch)
127126
{
128127
memset(item, 0, sizeof(*item));
128+
return parse_refspec(item, refspec, fetch);
129+
}
129130

130-
if (!parse_refspec(item, refspec, fetch))
131+
void refspec_item_init_or_die(struct refspec_item *item, const char *refspec,
132+
int fetch)
133+
{
134+
if (!refspec_item_init(item, refspec, fetch))
131135
die("Invalid refspec '%s'", refspec);
132136
}
133137

refspec.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ struct refspec {
3232
int fetch;
3333
};
3434
35+
int refspec_item_init(struct refspec_item *item, const char *refspec,
36+
int fetch);
3537
void refspec_item_init_or_die(struct refspec_item *item, const char *refspec,
3638
int fetch);
3739
void refspec_item_clear(struct refspec_item *item);

0 commit comments

Comments
 (0)