diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2017-08-26 10:28:01 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-26 09:21:01 -0700 |
| commit | 65eb8e0ca79d4a58768f9409b24c48a95d39bc55 (patch) | |
| tree | 836945d08ff835e5128fa677a796120d53323951 /builtin/merge-recursive.c | |
| parent | Prepare for 2.14.2 (diff) | |
| download | tgif-65eb8e0ca79d4a58768f9409b24c48a95d39bc55.tar.xz | |
notes: make GET_NIBBLE macro more robust
Put parentheses around sha1. Otherwise it could fail for something
like
GET_NIBBLE(n, (unsigned char *)data);
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions