Skip to content

Commit dc06422

Browse files
avargitster
authored andcommitted
refspec: s/refspec_item_init/&_or_die/g
Rename the refspec_item_init() function introduced in 6d4c057 ("refspec: introduce struct refspec", 2018-05-16) to refspec_item_init_or_die(). This follows the convention of other *_or_die() functions, and is done in preparation for making it a wrapper for a non-fatal variant. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6c301ad commit dc06422

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

builtin/clone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
10771077
if (option_required_reference.nr || option_optional_reference.nr)
10781078
setup_reference();
10791079

1080-
refspec_item_init(&refspec, value.buf, REFSPEC_FETCH);
1080+
refspec_item_init_or_die(&refspec, value.buf, REFSPEC_FETCH);
10811081

10821082
strbuf_reset(&value);
10831083

builtin/pull.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ static const char *get_tracking_branch(const char *remote, const char *refspec)
680680
const char *spec_src;
681681
const char *merge_branch;
682682

683-
refspec_item_init(&spec, refspec, REFSPEC_FETCH);
683+
refspec_item_init_or_die(&spec, refspec, REFSPEC_FETCH);
684684
spec_src = spec.src;
685685
if (!*spec_src || !strcmp(spec_src, "HEAD"))
686686
spec_src = "HEAD";

refspec.c

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

125-
void refspec_item_init(struct refspec_item *item, const char *refspec, int fetch)
125+
void refspec_item_init_or_die(struct refspec_item *item, const char *refspec,
126+
int fetch)
126127
{
127128
memset(item, 0, sizeof(*item));
128129

@@ -150,7 +151,7 @@ void refspec_append(struct refspec *rs, const char *refspec)
150151
{
151152
struct refspec_item item;
152153

153-
refspec_item_init(&item, refspec, rs->fetch);
154+
refspec_item_init_or_die(&item, refspec, rs->fetch);
154155

155156
ALLOC_GROW(rs->items, rs->nr + 1, rs->alloc);
156157
rs->items[rs->nr++] = item;

refspec.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ struct refspec {
3232
int fetch;
3333
};
3434
35-
void refspec_item_init(struct refspec_item *item, const char *refspec, int fetch);
35+
void refspec_item_init_or_die(struct refspec_item *item, const char *refspec,
36+
int fetch);
3637
void refspec_item_clear(struct refspec_item *item);
3738
void refspec_init(struct refspec *rs, int fetch);
3839
void refspec_append(struct refspec *rs, const char *refspec);

0 commit comments

Comments
 (0)