diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2016-04-07 15:03:08 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-10 11:35:37 -0700 |
| commit | ded83936106a94f854873e949fa7928dce8dbdd1 (patch) | |
| tree | b90763b2bb9cdc211bf4799cd2809c2b654c45a3 /builtin | |
| parent | checkout_paths(): remove unneeded flag variable (diff) | |
| download | tgif-ded83936106a94f854873e949fa7928dce8dbdd1.tar.xz | |
check_aliased_update(): check that dst_name is non-NULL
If there is an error in resolve_ref_unsafe(), it returns NULL. We check
for this case, but not until after calling strip_namespace(). Instead,
call strip_namespace() *after* the NULL check.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/receive-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index c8e32b297c..49cc88d72f 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1081,13 +1081,13 @@ static void check_aliased_update(struct command *cmd, struct string_list *list) if (!(flag & REF_ISSYMREF)) return; - dst_name = strip_namespace(dst_name); if (!dst_name) { rp_error("refusing update to broken symref '%s'", cmd->ref_name); cmd->skip_update = 1; cmd->error_string = "broken symref"; return; } + dst_name = strip_namespace(dst_name); if ((item = string_list_lookup(list, dst_name)) == NULL) return; |