diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:18:58 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:18:59 +0900 |
commit | 0f213754f6db9c005d881c13a858901e6d40ccb0 (patch) | |
tree | ab952b2cfeea72f2a57dc68fa887ce275794c2e7 /refs.c | |
parent | 550e41c43733a3dd35a53365a6509c28cbb3906a (diff) | |
parent | c788c54cde5f7d52e4db9d4971545c3b2456ddcf (diff) | |
download | git-0f213754f6db9c005d881c13a858901e6d40ccb0.tar.gz git-0f213754f6db9c005d881c13a858901e6d40ccb0.tar.xz |
Merge branch 'tg/refs-allowed-flags' into maint
API error-proofing which happens to also squelch warnings from GCC.
* tg/refs-allowed-flags:
refs: strip out not allowed flags from ref_transaction_update
Diffstat (limited to 'refs.c')
-rw-r--r-- | refs.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -921,6 +921,8 @@ int ref_transaction_update(struct ref_transaction *transaction, return -1; } + flags &= REF_TRANSACTION_UPDATE_ALLOWED_FLAGS; + flags |= (new_sha1 ? REF_HAVE_NEW : 0) | (old_sha1 ? REF_HAVE_OLD : 0); ref_transaction_add_update(transaction, refname, flags, |