diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:56 -0700 |
commit | c7528f4d8a2b8e4bf843b3eb95d2b7899a38c1fa (patch) | |
tree | f844bdf385f2f7cdd78ee77e3ce7b312da62e8ce /builtin/receive-pack.c | |
parent | df422678a800ffb1db8f3f146e2786f1cbf0059b (diff) | |
parent | f730944a49b2a210bb10520700c0a3f6c49bc020 (diff) | |
download | git-c7528f4d8a2b8e4bf843b3eb95d2b7899a38c1fa.tar.gz |
Merge branch 'bw/object-id'
Conversion from uchar[20] to struct object_id continues.
* bw/object-id:
receive-pack: don't access hash of NULL object_id pointer
notes: don't access hash of NULL object_id pointer
tree-diff: don't access hash of NULL object_id pointer
Diffstat (limited to 'builtin/receive-pack.c')
-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 136c44def7..14b6e09b42 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1138,7 +1138,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) } if (ref_transaction_delete(transaction, namespaced_name, - old_oid->hash, + old_oid ? old_oid->hash : NULL, 0, "push", &err)) { rp_error("%s", err.buf); strbuf_release(&err); |