diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-28 22:53:29 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 22:53:29 +0300 |
| commit | a9097269036141876c586ddeee561a37b686c8e5 (patch) | |
| tree | 7f496e3fd3a4c8aca1fe95c0978744e28e860e28 /builtin/pull.c | |
| parent | ed843436dd4924c10669820cc73daf50f0b4dabd (diff) | |
| parent | 7865d157a5e8d86f46e626d933bda5c18eab196a (diff) | |
Merge branch 'ab/refspec-init-fix'
Make refspec parsing codepath more robust.
* ab/refspec-init-fix:
refspec: initalize `refspec_item` in `valid_fetch_refspec()`
refspec: add back a refspec_item_init() function
refspec: s/refspec_item_init/&_or_die/g
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 49cc3beb4c4..fe002a72f8a 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -684,7 +684,7 @@ static const char *get_tracking_branch(const char *remote, const char *refspec) const char *spec_src; const char *merge_branch; - refspec_item_init(&spec, refspec, REFSPEC_FETCH); + refspec_item_init_or_die(&spec, refspec, REFSPEC_FETCH); spec_src = spec.src; if (!*spec_src || !strcmp(spec_src, "HEAD")) spec_src = "HEAD"; |